I decided it was time to bite the bullet yesterday and pulled the upgrade copy of Windows 7 Ultimate off the shelf to update the machine. It took a while, but it installed.
Then it pulled 83 updates. Now it's pulling down Windows 7 SP1.
So far, so good.
I'm still keeping my fingers crossed. (And it's damnably hard to type this way...)