I'm pretty happy with the current 16GB iPhone. Battery life isn't an issue and I don't use the camera that much. Mind you the photos it does take are pretty good anyway.
Good chance that I'll upgrade in 12 to 18 months to the 3GS.
This new firmware 3.0 update will make the current iPhones a much better platform anyway.