Google has more control over this than Motorola. Remember when we all got the file for the forced update? It came from Google. Google was asked about Android updates at the event and they said that all Google Experience devices will be updated to the highest version they can support. It's pretty clear the Droid can run 2.1, so I see no reason why they wouldn't update it.
There's even going to be a Verizon version of the Nexus One. So the CDMA/Verizon tweaked version of 2.1 will obviously exist soon, if not already. It will come... sooner or later.