Droid 3. But I may be biased.
For me, It's the Droid 3 because 4" is the perfect screen size to me, and the keyboard is absolutely amazing. The processor on this thing is great, and after the OTA update my batter lasts 2days easy on light to moderate use. On heavy use, about a day. Not to mention we're finally getting roms and themes being flashed. Example, I'm running an ICS theme and it's beautiful.
However, the X2 right now has more dev support considering its been out more and advertised more. And people like the 4.3" screen. Can't really compare screens since both use pentile, but I've seen some people say the D3's is a bit better. But I can't confirm that. Really either way you're getting a great.
One thing to consider is that it's said/rumored that the Galaxy Nexus will be out November 3rd if you can wait. That things gonna be a beast, first phone with ICS.
Sent from my DROID3 using DroidForums