How to upgrade from leaked 2.3.3 to OTA 2.3.4? Help!

I'm not completely stupid, but I can't figure out how to get on track to get the latest update for the Droid X that came out today. There was so much bad news about the first 2.3.4 release that I stayed away, but I've had enough issues with 2.3.3 that I wanted to see if they were solved with the latest version. I'm not rooted, and have no intention of doing so. Do I just need to wipe the phone and start over?