Long time lurker, first time poster.
I just did this update using option 2 last night.
The guides linked worked really well, congrats. The only confusion I ran into is that root and recovery are referred to as the same step and different steps across some of the guides linked from this thread (and then from those guides) so I was confused for a bit by whether I needed to do something additional to create custom recovery or not after rooting.
But everything is great and working now except...
None of the optional HTC widgets (like battery, the one I really care about, but also dice and etc.) will install. They'll download, or load from my sd card, try to install, and fail on install every time.
Is anyone else getting this problem? Something to do with 2.1 perhaps?