I ended up using the update here: http://forums.androidcentral.com/motorola-x-rooting-roms-hacks/112321-tbh-602-instructions.html#post1190156 and everything has been working fine so far, with the root intact.
When you switched over to gingerbread, did you do a full wipe? I did (including...