If you had to right now, the Bionic. Thought my phone was hosed a week or so ago and just about picked one up. Otherwise, I'd wait and consider an iPhone 4S/5, and whatever the Droid is that's announced shortly after.
Also using a Droid 1, almost certainly going to end up with an iPhone next. Going to take some time off from Android aside from my Google TV and let it catch up a bit more in the polish department. Tired of moving from ROM to ROM to keep my phone fresh and working well.