With the deadline for upgrade to 4.2 looming ever closer with no clear in-place upgrade guidance to fallback UEFI bootloader folks like myself I finally felt enough pressure to try out rEFind and am happy to report:
rEFInd from the fedora repo installed to a usb stick (seemingly) worked perfectly!
This is a much less stressful solution then the constant messing around in /boot/efi/EFI/BOOT from my guide. I’ll test drive it a while longer and see if it holds up through the OS upgrade, if all goes well I’ll write a howto for bypassing the issue using rEFind and put it in my guide thread.
Apologies for the thread necromancy, I just thought I should leave this here for anyone googling about the same issue.