I'm not sure how to best resolve the first issue. I suppose we can mention that if unsure which GRUB to use, the user can test whether "/sys/firmware/efi" exists on the live image. We could also make it clearer when booting whether the installer is in "UEFI" mode or not.