A new phone? Android vs iPhone

I want a phone aside from my iPhone. The problem is the only real option I see is the Google Nexus One. The Droid seemed like a cool phone but its not that great, especially be cause I know the new Droid X is out.

I would buy the Evo or the Droid X in a heartbeat, but there are CDMA phones and not on GSM yet, its quite unfortunate.