I second the recommendation for 3g and wifi. In many places, prepaid cellular data is significantly cheaper than hotel internet. A phone which functions as a virtual hotspot or can tether lets you hedge your bet. The UK is a classic example. You can pay US$30 a day for hotel internet, or buy more internet than you'd probably need for US$30 flat.

Watch out for Skype on mobile phones, there are two different setups going on and you can get burnt if you don't know the difference. Verizon in the US and Three in many other countries has tightly integrated with their system and voice calls out on the voice channel (not data channels) when you use that version of Skype. That could mean roaming in a foreign country.

I use to recommend a Nokia ESeries handset. They were great talk phones with decent wifi, good quality, and VOIP. The camera was also pretty good and had a nice tool set. It was not the world's most intuitive interface, but it had free GPS driving instructions, and a number of other feature. With Nokia pulling Symbian and the new crop of cheap Android phones, I'm tilting that way.

Skip the business functions, you have free GPS on Android, Facebook (if you are interested), great VOIP integration. I really recommend SIP Droid with its Google Voice integration with PBXes.com. You get unlimited texting over data, a VPN fo your VOIP, and the ability to forward your Google Voice number abroad because of it use of Asterisks. Google has good international rates, but you can beat them with SIPTraffic.com. GVCallback provides you a great callback service if you have international forwarding enabled.

I would probably look at the Motorola Milestone (aka a GSM "Droid"). Even though you say that you don't need a business phone, your other specs sound like you need something high end. Crippling the OS won't save you tons and may cut you off from travelers tools.