I would almost guarantee that the droid 2 will be running 2.2 when it is released. I just can't see it being released with 7 month old software, especially because by the time this phone is released in July, 2.2 will have been out for 2 months.
Things i noticed that no one else has mentioned, the camera is slightly different, the LED flash looks bigger than the Current Droid, and the back side underneath the camera is now one solid piece, which does make it look better.
As far as the keyboard, the dedicated voice search and back button hard keys are a welcomed addition, but losing the Shift key on the right side is something i will have to get used to if i upgrade because I always use it on my Droid 1.
Also with the new lip covering the right side of the phone, it appears that it covers up the microphone now, which draws some concern.
I wouldn't count this phone out yet.
It's definitely a let down especially with the iphone 4 getting introduced. But if the keyboard is a lot easier to use (I don't even mind the current droids keyboard) and if it does run noticeably faster/smoother than the Droid 1, and maybe the battery life is extended, I would say it could be worth the upgrade.
I may be wrong, but i don't think the droid 1 has an optional extended battery...
Its hands down the best phone on the market with a physical keyboard, something that is a huge selling point for me.