Windows 7 - restoring windows.old

I just upgraded to windows 7 from vista and after doing a few cleanup matinence programs and defragging, I restarted the computer and got the bsod after trying to start windows. I tried the bootrec.exe tool with no luck as well as the procedure to recover windows.old files here How to restore a Windows 7-based computer to a previous Windows installation by using the Windows.old folder after doing a fresh install
After following the instructions I just go right back to having the bsod. Most likely becuase I am restoring the files/settings that are causing it in the first place.
How can I repair my previous installation? If I had to reinstall everything from scratch it would take forever so I would like to be able to repair it if possible.
I have also tried sfc /scannow with no luck. Is there a way to scan and fix the files in the windows.old folder before restoring them?


The last step on restoring windows.old says
Step 5: Restore the boot sector for the previous Windows installation

Type one of the following commands at the command prompt, as appropriate for your situation.


Note In the following commands, D: represents the DVD drive. If the DVD drive on the computer is represented by a different letter, such as E:, use that letter in the command.

• When the previous Windows installation was Windows Server 2003, Windows XP, or Microsoft Windows 2000
  
  Type the following command, and then press ENTER: D:\boot\bootsect /nt52 c:
• When the previous Windows installation was Windows Vista
  
  Type the following command, and then press ENTER: D:\boot\bootsect /nt60 c:

Since the previous installation was windows 7 do I just skip that step? or is there a different nt code for it?

Take a look at this tutorial:


Windows.old folder - Restore into a new installation

That is actually the one that I tried. I just went back to giving me the bsod. Windows would load up until the mouse cursor shows up and then crashed.

It looks like the only difference between the 2 is that the one I posted inlcudes the program data folder.