I had to restore my phone to take it back to Sprint just the other day. Here's what I did.
Flashed unrevoked-forever-son.zip
Then ran the Official Sprint ROM update.
All went well as to be expected. My phone was still hosed and rebooted about 50 times, but Sprint exchanged it for me (for a $35 fee). I got a nice refurbished phone and it was back to my custom rom 20 minutes after I got home. Guess I'm getting good at this!
PS: Using the new one touch Unrevoked is much easier than it was the first time messing with the PC36 files in order to root your replacement phone. After only 20 minutes of using the Stock rom, I realized just how much was missing (or added in some cases). I did have an issue where it didn't want to continue, but after a PC reboot, it finished the Clockwork Recovery without a hitch. I'm back to normal again!