So get rooted. It's a piece of cake (I used EasyRoot, but there are a number of options) and it opens you up to so much more. If you don't want to go that route, you'll have to flash the 2.1 sbf files and then upgrade to the OTA. If you want to do that, just do a google search for "flash 2.1 sbf on my droid x." Personally, I'd stay with the leak, root and go the Rubix route. I find the hacker development community to be much more responsive to issues than the OTA world. If you don't like it, you can always flash the sbf and then get the OTA.