to iphone or not to iphone?

Been thinking about getting a new phone as my current one is acting up, was thinking about an iphone but to be honest not all that happy with what the current model has to offer. Sure its great,has decent storage capacity and I have an Ipod Touch so I'm familiar with its interface and love it but can't help but think if I hold out a bit longer I can get the new version of it. It's bound to come out soon, and I find the 2 Megapixel camera on the current model is waaaaaaaaay too outdated. I just can't justify shelling out almost $1000 bucks for something with a camera that has the same resolution as my current crappy $200 Ericksson.