This is not how I did it, but glad it worked for you. I followed the guide here: http://forum.xda-developers.com/show....php?t=2017525
I backed up my pics, movies, music and whatnot, then I flashed TWRP 126.96.36.199 and did a Nandroid backup of system and data. TWRP is known on our device to make better backups and restores than CWR. ***NOTE*** flashing the RUU will completely wipe your phone including your backup. Make sure you copy the entire TWRP folder to your PC!!!***
Next, I locked my bootloader using:
I then flashed the RUU as administrator. When the device boots up don't worry about GPS or signing into Google. Force an OTA update under Settings\About\Software update. Accept the update. It will download and then ask you if you want to apply. Answer yes.
The phone will reboot into stock recovery and start flashing updates. It will reboot the recovery at least once while doing so. Do not touch your phone until it boots into Android automatically. Again, don't worry about GPS or Google login. You SHOULD boot into a message that says the 2.04 update was successful. The first reboot from my "update" did not stick. I had to force another OTA update download and told it to apply again. It worked for me the second time.
Once you have a successful 2.04 update, fastboot into bootloader and unlock your bootloader again with your original unlock_code.bin.
I'm not sure if this applies any more, but step 8 of that guide says to flash the unlocked kernel and recovery. He's referring to the kernel ripped from dsb's s-off dev phone he got from the DNA launch. It allows for root access and custom recoveries to be installed. I'm not sure if this is necessary any more, but it's the only kernel I know that when you flash it, it automatically makes the phone boot into Android and you have the new "Do no not distribute outside of HTC blah blah blah" HTC logo screen. It also makes your bootloader say ***TAMPERED*** again.
I've uploaded it here
(Right click and save)
After it boots into Android copy the TWRP directory back from your PC. Reboot into fastboot and flash TWRP and any kernel you want. Restore your backup (system and data.) Flash any kernel modules necessary. Wipe dalvik cache and cache (do not factory reset or wipe system.) Reboot and PROFIT. (Restore your pics, movies, music and whatnot.)
Again, this is how I did it. YMMV.