OP Instructions Worked...
I followed the instructions in the OP and everything worked for me. I'm now back to stock out the box. While at 1.82, I had to apply the one-click root and then do all the ADB stuff, but it worked like a charm! Now I just have to wait until my local store gets their stock of phones. Stupid customs. Stupid Apple. Stupid HTC...Anyway, Thanks, op.
Unlocked & Rooted
W/ Scott's AT&T Stock Root 1.26.502.10
Past: HTC One X, HTC Inspire 4G, HTC Pure, Samsung Blackjack II, Motorola V3xx, Moto V3i, Moto V3, and a whole bunch more...