I wondering if I can un-root now without hosing my entire phone
I don't understand what I'm reading over at xda
if you RUU back to stock you will effectively reset back to factory... wipe the phone.
I did it this morning, and while I have to reinstall applications/lost my SMS messages my phone is fine.
It's pretty simple to do.
1) download the PB31IMG.zip file from the thread on xda
2) drop this file on the root of SD card (just drag it to the SD card, you don't have to do a adb push or anything)
3) pull the battery/shut down the phone
4) hold down vol - / power to get to the HBOOT menu.
-the phone should find the PB31IMG.zip file, read it, check it and then ask if you want to install. It will do some work, ask to reboot, and then ask to install again.
5) reboot the phone and you're back to stock.
6)Wait for the OTA or follow the instructions to install the leaked update if you are brave. Once the OTA comes across use unrevoked to get root back.