After a second call to TMobile customer services, and a second claim to have sorted it out, my next bill appears to have been correct, although a little confusing with discounts and refunds. Let's hope they are correct from now on. It even looks like Quidco will be stumping up the £50, although not got final confirmation yet.