BootCamp "boot to OSX" boots to recovery instead of macOS
A possible solution would be to install rEFInd in your EFI partition. I would first test by installing rEFInd on a USB flash drive. If MacOS and Windows boot from rEFInd, then you could copy rEFInd to you EFI partition.