Your best bet might be to use the link near the top of your email receipt from MS to start the process over, but instead of doing the Upgrade, when you have the choice choose Install by creating media, then choose Custom install.
This allows you to burn the ISO file to a DVD or Flash drive and use this to boot to. Choose Save Nothing and Custom, or whatever.
Install the OS and all your apps again. Then change your pointers in the OS to the data partition (drive) using the
approved method.
The installation should not affect your data partition (drive) what so ever. This is the exact method I used and our 2 laptops (conventional non-touch 4 to 5 years old) work perfectly.
I realize this involves more work, but how much time have...