I think a new model iPhone would have to be the way to go and I'm waiting to see what all the company's offers will be.

I keep finding other options though. At the moment it seems to be between an iPhone (which is cool), a Nokia E63 or E71, or perhaps a Blackberry Storm (which promises unlimited email and web which I need to investigate further).