After much back and forth, I've decided to go to the dark side - I'm going to buy an IPhone and a Mac. I still have my issues with the Sith Lord Steve Jobs control freakishness over apps, but their loosening of the provisioning rules for the IPhone apps, so I can develop apps and make them available to my customers to provision to their employees without going through the app store has made me really lean in Apple's direction.

iPhone Pros (iPhone 4)

• what hasn't already been written about it. Great camera with flash, HD video, dual cameras, dual mics, etc.
  
• WiFi connectivity when it's available so I'm not using my minutes or bandwidth most of the time
• Great app SDK
• Multi-tasking
  

iPhone Cons

• Sith Lord Steve Jobs
  
• Objective-C (have to learn it, but I write in a slew of languages anyway)
• Can only develop apps on a Mac (have to buy a Mac)
• Non-replaceable battery by me
  

So the alternative is an Android phone, but I haven't been blown away by anything on them. I'll be developing apps for it, but for my own phone, I'm going iPhone.

UPDATE
The issue with the reception on the phone (see Gizmodo, and just about any other outlet) hasn't made me rethink it. However, see Jobs' replies to his customers - typical Sith Lord response.