Booting from one drive still results in the second drive being the main drive.

I can't title this well, but here's the long of my predicament:

I have 2 drives, an old HDD, and an old SSD that I cloned the HDD to years ago before beginning to use it as my primary drive.

I decided to change my drives from mbr to gpt. I could not do this because the SSD did not have enough "unpartitioned space", I had to hunt down and delete some unmoveable files,, which was its own insane wild goose chase, but I shrunk the C drive by 16.5 gb and it allowed me to change both drives to gpt.

Unfortunately the efi partition was made between the C drive and the unassigned space, making it impossible to amend it to the C drive. Foolishly, after some googling, I decided to use a partition assistant im apparently not allowed to name, which with the benefit of hindsight makes sense, to move the efi partition to the end of the drive, then extend the C drive.

The result was a bootloop and an error after the pre-os partition extension finished.

Stupidly, I went to bios and made it boot off the old HDD in hopes to fix the SSD from it.

I used diskpart and bcdboot to refresh the efi partition on the SSD, as I assumed that the process of moving it had broken some connections, and made it a dummy efi.

Now, when I boot from the SSD in bios, either assigning it first in boot order, overwrite booting from it, or making it the only option in the boot order, it ""boots"", but it still boots from the HDD, assigning it as the C Drive and running the old version of windows 10 on it. Additionally, the system reserved partition on the SSD is now just marked as a normal drive.

I used:

bcdboot C:\Windows /f UEFI /s S: /v /d

On the SSD's ufi partition, which I had assigned "S" to.

I just earnestly hope there is some way to fix this without having to fresh install over the SSD, as everything is still there. The OS and system files within what was the C Drive on it are still there. I'm not sure where to turn to or go, if this isn't the right place for this kind of concern, I apologize, and simply ask for the right directions.