I'd take a look at the new Nexus One, if an iPhone's not for you. It has a newer version of Android included and I think there may be a version with a physical keyboard coming.

I'd also have another look at the iPhone.