Android phones, apps and tablets

I'm due an upgrade with o2 and i'm looking for some advice as to what I should be aiming for.

I think I want the HTC One X, which on Three is £29/month with a £29 upfront charge, which is okay.

Should I be expecting o2 to match that or to better it, or what? I've been with them (and had the same SIM card) since they were BT Genie. They owe me one I reckon. What's the minimum I should be looking for?

The 'best' they could do for me, after being a customer for over ten years, was a £32/month contract giving me 600 mins and 500mb of data, with a £59.99 upfront charge.

After 40 mins on hold.

I am leaving them out of principle.

Where do I go now? Can someone help me get a good deal because I'm clearly shit at this. I want a good phone, like an HTC One X, I don't need to wait for a Nexus because I need a new phone ASAP.

I also don't want to pay much more than £30/month and as little an upfront charge as possible.