Glad to help!
It's interesting that my reply stimulated you to reveal you are running W10 Insider Edition, versus RTM-pre-AU or RTM-post-AU version.
This is one of the reason why we ask folks for their
EXACT version of W10 (current is v1607 b14393.693) for example as of this week's push update on Tuesday 1/10/2017. It's certainly worth mentioning to you know that several of us here including most of our Admins and myself are long-time W10 Insider Testers. Myself I've been one since Sept. 2014; 2 yrs. 4 mos. now. This question now seems quite obvious; in addition to REMOVING that 2nd physical drive while troubleshooting your booting problem; you should make a Backup Image file of your C: drive (the SSD), or purchase a 2nd SSD drive of at least the same or better capacity. Then, wipe out everything on that SSD drive and reinstall using the latest version W10 Post-AU
(post Aug. 2nd 2016) version on the wiped 1st SSD boot drive, or swap out drives with the newly purchased 2nd SSD (now the new boot drive: C:/) and restore the Image file onto that drive using the RTM-post-AU version. Retest your boot options. Try this with the existing legacy option first. If it works, I suggest you repeat that whole process; wipe out the original SSD with the W10 RTM-post-AU build, but this time attempt it with your UEFI BIOS Enabled. If it works, great!
If it doesn't work, then it's most likely due to some inherent flaw in your hardware.
Of course, you realize that being a W10 Insider means that you are essentially running BETA software, and that means there could be bugs with your version of W10 that manifest themselves in weird ways: UEFI conflicts and booting problems are both symptoms of that? Is this laptop your "daily-driver" machine; one you use for browsing, E-mail, online banking, bill-pay, etc.?? If so, that's really not a good idea to run Beta software on a production computer!
You should pick up an old refurbished desktop PC or laptop and use that as a test machine to run Beta software.
That's how most of us Insiders do it here. I have 7 machines I have W10 on for testing purposes besides my
"daily-driver" desktop PC. That machine is running the latest RTM-post-AU version which is Activated and 2 others as well. The rest are running combinations of RTM and Tech Preview versions for testing purposes, and get broken regularly. No big deal. They are all Imaged backed-up as well.
The other thing you didn't mention was that since you upgraded from W8 to W10, did you remember to perform a Motherboard BIOS update to the latest BIOS version? Most machines running W7/W8 that are between 6 and 8 years old now. That's old enough to need a BIOS update to make your UEFI BIOS options compatible with W10!
Several of my test W10 machines are 8-11 years old and
ALL have their BIOSes updated. This is important, as the
W10 COMPATIBILITY TEST doesn't really pick this item up; so you wouldn't know from the Test report that it needed to be done; but it is. You should also know that if you've never done a BIOS update before,
it's VERY HIGH RISK TO ATTEMPT TO DO YOURSELF!! About 98% of my Students and Customers who do so fail on the 1st attempt and BORK THEIR MOTHERBOARD!! If you haven't done it, you should pay a professional Tech to do for you. BIOS updates, especially on UEFI machines are often needed in order to get W10 to run; and that's true for the Tech Preview editions as well as the RTM (Live, licensed) verisons too.
Don't know if you are doing Image Backups or not, but the 3 Backups softwares we tested here for both Tech Preview and RTM editions for W10 are:
1.) Macrium Reflect (I mostly use)
2.) Acronis TrueImage (rarely use)
3.) EASETodo (occasionaly use)
Most of use are using multiple drives in our Test machines (for Tech Preview installs), as well as RTM installs. Running Beta software requires multiple machines *if you have them or can afford them*, or at the very least multiple hard drives
ALONG WITH making Image Backups: regularly!
This might help you sort out some of your boot problems with that laptop in the future. Do your OS builds on a secondary machine (especially with Tech Preview editions), or at the least a secondary HDD and check if your UEFI BIOS has been properly updated to manufacturer's latest version from their support website.
Best,
<<<<BBJ>>>>