I don't think it has anything to do with two m.2 drives. I also have two m.2 drives, one for windows and the other for macOS.
I will download your EFI and have a look at it later. But as @Shaneee and some others also mentioned a few times, there are some issues with MSI boards in general.