My wife who was always a Blackberry girl is sold on the Droid now thanks to Google navigation being amazing as crap. Now I have an excuse to jump, especially since she doesn't want to put out the cash for it.
But yeah, owning either of those Droid phones now would make upgrading to X negligible.
I don't see the draw to 4G yet and even then lets see what happens when we get to that point. So far it doesn't seem worth the money nor the upgrade over 3G. By then we will have yet another upgrade available.