Worth getting an iPhone now?

[Arterion]

Seeing as the 3.0 software seems it will fix many of the major gripes I had with the device in the first place, is it worth picking one up now, or is there new version of the hardware likely to come out soon which would be worth waiting for? All I'm really looking for now (that I know of) is a better camera, but that's hardly essential...

 

[Arterion]

Macrumors says that someone has picked apart the Beta of OS 3.0 and found hardware model references that point to upgraded iPhone and iPod Touch models on the way. I reckon there will be a simultaneous launch of the updated OS and new hardware.

Makes sense to me...d'oh, more waiting

 

[Arterion]

Well my contract runs out next month. I'm wandering whether to grab a 3G one free on the £45 contract as soon as my old one ends, or get a simplicity sim, keep using my 2G one and wait till the announcement.

Hmmmmm decisions.

After everything I've heard I'm gonna wait, I'm sure details will trickle through before July we'll probably know whether it's gonna be worth it in the next 8 weeks or so. Or, I might cave and get the HTC Touch Diamond 2, it's looking pretty sexy...