I got a Moto CLIQ as my last upgrade (from a G1). It's so much faster than the G1 it's like night and day. I don't use any of the "social networking" crap that came with the CLIQ but I like the fact that I can manage all 5 of my Gmail accounts with it.
I did a side-by-side with a coworker's Droid and came away preferring my CLIQ anyway, despite the gorgeous screen on the Droid. The clincher was the keyboard, which IMHO sucks on the Droid. I need a physical keyboard to be able to use the phone effectively, and the CLIQ's, while not as good as the G1's was, is lightyears better than the Droid's.