More battery life and a more powerful processor would help. The phone chugs along at times with the more demanding web pages and games, but overall its pretty good. I have a 16GB and its plenty enough for my music tastes, which is wide, and I have a big library but I dont care to have it all with me anyway. If you will have movies, even 16GB will be smallish.
The camera is fine, it needs a better lens and software package to give us better quality snap shots.
I would wait personally, as it will likely cost the same and you will benefit from the development improvements for the year.