Interesting InlandAZ, I skipped Vista altogether and didn't know they fixed the things people were complaining about. I've been very happy with Windows 7 Home Premium and if Windows Vista is now about the same then I wouldn't upgrade to 7. As for Windows 8, that's going to be a very different animal. I am leaning toward sticking with 7 for now. The big selling point of 8 that I can see is touchscreen support and commonality with smart phones and tablets also running Windows 8. I'm an android guy for phone and tablet so I'm going to wait to see if there's really some big improvement in 8 that I can't live without.
One other point that may never come up for you; Vista will stop being supported April 11, 2017, Windows 7 end of support is January 14, 2020. Details are here:
http://windows.microsoft.com/en-US/windows/products/lifecycle