kathrync's case helped me to improve Boot-Repair.
Boot-Repair should now handle several EFI partitions, and add "Windows UEFI loader" as well as "Windows UEFI recovery" entries when available.