Leaked 2.2 won't upgrade..any ideas

[GatorDroid]

I have Droid X with original leaked 2.2 and obviously can't get the 2.2.1 update through system updates. Are there any simple ways around this, and or if 2/3 comes out am i going to be faced with the same problem?
My insurance through my business account actually get's me a new Droid X if damages for free, so i'm tempted to just start over without leaked. Any ideas would be appreciated.