If you disconnect the 2tb HDD can you boot in to Windows or does the BIOS still not remember were to boot from?
Forget that I just read the bottom bit. Do you have another spare HDD that you can plug in to replace the 2tb and see if it still has the same problem?