so i guess i should pull my battery.
Here is what I did.
1) Put RUU on SD Card and name it correctly.
2) Reboot to Fastboot and relock the phone.
3) Reboot to HBoot and let it find the RUU and flash it.
4) After it reboots and hangs, wait several minutes and pull battery, start flashing again.
5) Boot into the OS, skip setup, make sure it works, then shut down.
6) Pull battery, reboot with Vol/Down and Power to get into HBoot, select Fastboot USB and unlock phone as per HTC instructions
7) Phone will reboot and boot into OS. Turn on USB Debugging and use Scott's CleanTool to install Amon Ra.
8) Boot into Recovery, wipe phone, cache, Dalvik and then install ROM and follow instructions.