Help G3 3579 Boot Issues

I'm having an issue with booting up. Windows is on the M2 SSD, always has been as it comes that way from the factory. Storage is on the SATA ssd. Somehow I changed something and now there's a boot partition on the SATA drive (not sure if it was always there or what).

This seems to be throwing the BIOS into an endless loop. It starts booting, go to black, shuts down and keeps doing that over and over.

If I F12 and get into the boot manager I get the two option 1) boot from the SATA partition 1 and 2) boot from the M2 Nvme partition 1.

Selecting 2) I boot no problem 

Here's the issue, if I go into the BIOS and look at the boot order it shows 1) the SATA partition 1 and 2) Nvme partition 1 on the. If I delete the SATA boot and move the Nvme drive up to 1) and save "custom settings"it restarts and boots normal. Great!

However, when I restart the computer it does the same infinite boot cycle. When I go back into the BIOS boot sequence it's now added 1) WINDOWS BOOT MANAGER 2) Nvme partition 1.

This may not make sense to some so to simplify, I believe the BIOS is prioritizing the SATA drive and when I set it to the M2 drive it works, but on reboot it's adding "WINDOWS BOOT MANAGER" to the priority list, which for some reason sends it into a infinite loop instead of moving on to the 2) selection which is the Nvme boot partition 1 which actually works fine.

I've tried changing things in the BIOS but my understanding of legacy drives and UEFI internal/external, USB, SD etc. Randomly changing things doesn't work. I think I have to delete this boot partition on the storage drive but I'm not sure.