So, I used the froyo to gingerbread liberty to liberty update zip from the rom manager, and everything went well. No problems, except that it took a long time (but I'm blaming the server for that).
Build, tonight's build, can't see the version number right now.
Droid x, (big surprise)
Started updating around 9 pm pst, it's currently 4:30 am, yeesh. Problem was that I would get a successful install/update, and cancel the google restore. downloaded the liberty tools from the market, and restart the phone.
Go into liberty tools and use restore apps and data. Zeam recovered the home pages, but couldn't recover the widgets (expected behavior), but would force close when trying to remove items from a homescreen. This prompted another reboot. Sticks at boot animation, forcing battery pull to recover. I recovered, and tried the exact same thing again, and it reproduced. Weird.
Edited to add:
This apparently also leaves it in a state where it can't boot into recovery mode.
From powered off:
Hold power and home.
See Liberty, and release power button
Wait a few moments.
The phone does a short vibrate, then shows a black screen.
Liberty comes back up for a while again, then vibrate and black screen.
So I don't know if my backup is bad, or if there is something wrong with the apps I have backed up, but it would seem that restoring apps and their data is a bad idea right now.