Windows 7 BCD Oops > EFI

How can I switch a machine to boot from the Windows 7 boot file (MBR?) instead of EFI when both exist (oops) and HP doesn't offer that option in UEFI/BIOS?

The story

Windows 7 HP Pro 3500 Mini Tower would not allow me to use any USB devices. (I'll fix that part later.) I had to do a hard shutdown and BCD decided to go corrupt. Not thinking about it, I booted from a Win8 DVD and rebuilt boot settings with bootrec (/rebuildbcd, /fixboot, etc). Now I think I created a EFI boot process and need help rolling that back. I repaired Windows 7 so that it boots if I select the Legacy drive by manually selecting the boot device. Without it boots to the blue Win 8/10 error screen with

Boot Configuration Data for your PC is missing or contains errors. 
File: \EFI\Microsoft\Boot\BCD
Error Code: 0xc000000f

I think I just need to remove whatever points to the EFI boot, but I'm not sure how to do that. As I said, I've already repaired the Windows 7 boot with bootrec, but it did not remove the above message/EFI boot. And, the UEFI/BIOS settings don't contain an option for disabling EFI and switching to only legacy boot.

When I force it to boot form the Legacy HDD, it boots. HOw do I undo my stupid move and get rid of the pointers to EFI?

UPDATE: 1. I'm not sure if it was using MBR/Legacy or not. I know I received the blue error screen that doesn't exist on Windows 7, so I assumed it was GPT/UEFI. But... 2. I fixed both issues. I finally got it to boot, but then still didn't have USB. So, I ran System Restore and went to the last restore point. I didn't stop to think that would restore boot info. Now I'm up-and-running correctly. Weird issues and I'll run the HDD diags to be sure nothing bad is coming, but it looks like it's solved. 3. I'm going to check for firmware and driver updates through HP and created an extra restore point.

So, done I guess. Hopefully no more issues.