The solution is rEFInd. It even executes from any external boot stick under Linux or Windows (manual). No configuration required and only takes a second. It finds any EFI files and presents them as an icon.
Qubes OS
then starts fine after a BIOS update on MSI motherboard or when the boot manager gets lost otherwise.