Here's what I would do. Go
here and download the release candidate of windows 7. I have it running on my wife's computer and have yet to have a problem whereas vista was a disaster. If you do this you will have the option on the install to do an entirely new reformatted install. The RC version is good for a year so once 7 comes out officially for purchase go buy your upgrade and you will be good to go!