Yeah, I think I like going into Windows directly, seems better to me to have the ACPI board info correct. It does seem to reset your cryptographic identity so it's best to pick a method and stick to it. (it asks to re-enter Microsoft password when you change the method)
My method going forward. UEFI set to boot Windows directly by default (bypassing OpenCore). OpenCore is set for Mac as default. I press F8 when first booting to get the boot menu, I choose the SSD with OpenCore on it when I want to go into macOS... I do nothing if I want Windows.
The reverse of all of this could work too. OpenCore set as default in UEFI, press F8 and choose Windows drive if you want Windows.