Is there someone that can help me convert my Fedora install from GRUB to systemd-boot and actually get it where kernel updates won't break it?

The reason is that my MS Surface GO does not work with GRUB for some reason. Probably a non-standard UEFI implementation but I both found this to be the case personally and google seem to confirm this. One proposed solution is to use systemd-boot, which I have semi-successfully done. 

Getting to where I can boot the currently installed kernel is chronicled here:

https://lists.fedoraproject.org/archives/list/users@lists.fedoraproject.org/message/DDSAMQUGXWYTHAC73W4DTLDOLRM56FNX/

If I wasn't using both the internal NVME for "/" and a SD card for everything else I probably would have just converted the /boot partition to FAT32 and made it the new ESP partition...

So the last two steps is:

1. See if I can get it working with secure boot enabled.
2. How to make it work with kernel updates which are completely grub centric. 

Side question: If you're booting EFI with GPT partitions, is there any advantage to using grub over systemd-boot? The latter seems much simpler as the former seems way more complicated than necessary including the very fragile environment block[1]

Thanks,
Richard

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1625124