This seems to be fixed with the 5.14 kernels. Both 5.14.0 and 5.14.1 are booting fine with grub2-i386-efi-2.06-6.1