This is the way. I just discovered this, but the lazy way. If I want windows, I mash f8 on startup to get the manual boot selection. I never start windows through grub (systemd-boot in my case). It has its own EFI partition.