Samsung Omnia II (CDMA)
Can't believe they finally released it
I also have the Droid, and i am keeping that phone as well, for the Google Voice app, mainly. The camera sucks on the droid, and it does also have its fair share of problems.
Go for the Omnia II if you are going to be using your phone for business, Outlook/Exchange support, or you need Office Mobile. Go for the Droid if you need a phone that has an outstanding navigation system and decent virtual keyboard.
I'm overjoyed it doesn't have a slide out keyboard. I would even consider it if it had, but then I'm not a heavy text person either.
I have also had issues with trying to use the phone while i have a notification. The notification demands that I respond to it before I can use my phone again.
And then there is the issue of the touch screen which if you do not touch in exactly the right place, all of a sudden you are not where you wanted to be.