It all depends on one's preference and how you rank them. For me a 5.0MP camcorder is as important as a web browser or multi-touch screen. So this is how i rank the features. 1-10 (one being the least important and 10 being most important)
1. 5.0MP video recorder (rank 10)
2. Web Browsing (10)
3. Ipod (5, i can careless if iPhone has this)
4. photos (3, i can careless)
5. emails, push technology (10, i use Yahoo! very important)
6. GPS (8)
7. Multi-touch and easy to use (9)
8. 3G (5, i don't plan to pay to use data, i'll do w/ wifi)
So based on my ranking and preference, i am undecided, but i wish iPhone 2.0 has a video recorder. Both phone has their own advantage, Nokia has the 5.0MP camcorder and GPS. iPhone has easy to use multi-touch, push email, better web browsing i think. If one of these companies combined both technology together, it will be a selling point for me. In the meantime i am waiting until my contract is up in Nov and hopefully a better version of iPhone 2.0 or Nokia.