I don't think the X1 is out yet, I'm at work tomorrow so I'll try and find out about it all. If you want, you can PM me your mobile number and postcode and I can find out what kind of upgrade you'd be looking at in-store so you can base an "argument" on it. Up to you though, as I said we don't really get a great idea of what lee way options are available.
Alex - I've heard rumours that T-mobile workers get a free phone, is that true? And remember, if he gets the deal he wants, he could walk away with the £35 tarrif but for cheaper. Stick with o2, you know you want too

Lol just kidding.
P.S. There's also the Treo 500 but to be honest I have NO clue when it comes to that phone but I know it's on that "smart-phone" level.