Open LUKS instead of reformatting it
Format EFI partition to VFAT
Create the GRUB config dataset earlier