StMark's said:The iPhone 4 will also drop in price (as well as the 3GS) so might be worth waiting a few days to check out the deals on this. I've been happy with mine, apart from battery life which they still haven't significantly improved. Apart from the upgraded chip and camera, all the hype seems to be around the new voice control.
I bought a new battery for mine from the internet and installed it no problem.
I was great to go back to a new battery.