While I had to run it through the shredder I finally sat down and went through all the passwords I've ever used and figured it out :)

I turned off Secure Boot but it still won't boot Fedora.

I finally figured out I had to use -v to get what I wanted from efibootmgr:

BootCurrent: 0001

Timeout: 0 seconds

BootOrder: 000E,0001,0003,2001,2002,2003

Boot0000* Fedora HD(1,GPT,b2fa98e2-c3c8-4798-8faa-1e424d313bb1,0x800,0x32000)/File(\EFI\fedora\shimx64.efi)

Boot0001* Linpus lite HD(1,MBR,0x7c3f77cf,0x1c7e4,0x4df8)/File(\EFI\Boot\grubx64.efi)RC

Boot0002* Unknown Device: HD(1,GPT,b2fa98e2-c3c8-4798-8faa-1e424d313bb1,0x800,0x32000)/File(\EFI\fedora\shim.efi)RC

Boot0003* Fedora PciRoot(0x0)/Pci(0x17,0x0)/Sata(0,0,0)/HD(1,GPT,0d7acc81-f083-490b-b47f-a8cce7c591be,0x800,0x32000)/File(\EFI\fedora\grubx64.efi)A01 ..

Boot0004* Unknown Device: HD(1,GPT,0d7acc81-f083-490b-b47f-a8cce7c591be,0x800,0x32000)/File(\EFI\fedora\shim.efi)RC

Boot000E* Windows Boot Manager HD(1,GPT,b2fa98e2-c3c8-4798-8faa-1e424d313bb1,0x800,0x32000)/File(\EFI\Microsoft\Boot\bootmgfw.efi)WINDOWS.........x...B.C.D.O.B.J.E.C.T.=.{.9.d.e.a.8.6.2.c.-.5.c.d.d.-.4.e.7.0.-.a.c.c.1.-.f.3.2.b.3.4.4.d.4.7.9.5.}...................

Boot2001* EFI USB Device RC

Boot2002* EFI DVD/CDROM RC

Boot2003* EFI Network RC

I'm thinking the 0000 is the old Fedora installation from the bad HD and 0003 is the new entry but I've never seen "PciRoot" before. And still none of this is intuitive, there's like 6-10 efi files and I don't know which one I should use of it it even matters...

Or maybe it's the opposite. I'm at work so I can't check but I believe b2fa98e2-c3c8-4798-8faa-1e424d313bb1 is the PARTUUID of the new drive, and there's other entries with the same UUID with RC at the end which I assume are "detected" entries.

Thanks,

Richard