It will be interesting to see what apple produces. Being that they can't make the chippery too much smaller - onto reducing the battery size - perhaps make use of the carbon-nano tube paper batteries that I have seen floating around of late.
Regardless of what your personal preference is when it comes to phone - I appreciate that people get passionate about it, it helps spur companies on to compete against each other. Not a fan personally of Iphone OS 4 - a couple of friends have tested it - just seems to include things that should have been on the 2G, keeping 3rd party apps open, having a background and camera zoom (which you could get an app for anyway?)
I am still yet to migrate from my N95 - have not come across anything worth spending out on an expensive contract for.
Ideal upgrade:-
12MP camera, with Xenon flash
32GB internal Storage with Micro SD upgrade
1Ghz Arm processor (samsungs new one, or the new dual core ones Arm's are set to release this year)
3.5mm headphone jack
Touchscreen/Qwerty
Some form of multi-tasking (not sure why no company has included a side by side multi-tasking yet - whats the point in running them in the background, some screens are big enough)
WiFi, bluetooth 3.0
many phones coming out have these features - but no one has made one including all of them yet? COME ON PEOPLE, MAKE THE DEVICE!!