Completely forgot about the grub issue. At some point I gave systemd-boot a try and never went back.