Finally got around to upgrading to Windows 7 RTM, only to be greeted with the following:
You cannot upgrade this prerelease version of Windows 7. Go online to see how to install Windows 7 and keep your files and settings
A quick Google found these instructions. Should save you the hassle of rebuilding your PC 