This is why I always recommend doing a fresh install, rather than an in place upgrade. I installed Windows 7 6801 over Windows Vista, and then did a clean install, and the clean install ran a whole lot faster than the upgraded one.
So my advice, backup and clean install.