Dude, STM, I applaud your efforts at being above board, but PLEASE don't pay the extra for a retail pack of Win7. I agree with you, their licensing has us all screwed, but there is a reason Newegg has all those OEM copies for sale! heh ...
I just can't feel good about you giving a giant corporation more $$$ for a box...the DVD is exactly the same one from the same machine inside!
There are just so many better things to upgrade on the rig than a retail copy...I just have to say it, sorry.