Hmmm, I'll probably get mass-downvoted for this opinion… but maybe UEFI is trying to do too much? Boot firmware is one of these things you leave well alone unless you really have an egregious problem ...