I have the original Droid. I too love the physical keyboard. I'm really excited about the next round of phones being announced right now, but I am hesitant to without a keyboard. However, it looks like I will be keyboardless soon!!
If I was buying today, it would, without a doubt, be a Droid X. I love the large screen and I personally think the phone is gorgeous. If I was going to wait on the new phones, the Droid Bionic currently is in first place for me. I will have to wait and see how the Bionic feels though. As something that I will handle dozens and dozens of times per day, it will have to "feel" right.
If you are going to stick with a keyboard phone though, the Droid 2 is top of the list. They are truly great phones and will be relevant for a long time.
Good luck.