Hi: & Welcome to Linux Questions.
Next time you have Ubuntu up and running try updating Grub. That should help.
Use the terminal and as root run:
That should put your Windows os and your Ubuntu Linux in the same Grub Menu.
That way you could use the arrow keys to boot which ever os you want.
If that doesn't help try these 2 articles on UEFI Booting and Ubuntu:
https://help.ubuntu.com/community/UEFIBooting
https://help.ubuntu.com/community/UEFI