It sounds like it might be worth reinstalling Grub again.
If you can boot into the system, it's as simple as running grub-install (much easier than the whole chroot from live media process).
Before you do, clean up unwanted boot entries with efibootmgr. If this is your only system on the machine (i.e. not dual-booting), I would go ahead and delete all of them since you have a few broken ones. grub-install will automatically create a new EFI boot entry after it runs.