I switch very regularly and had difficulty until I begun to just swap out keyboards between macOS and Windows. That somehow ties my muscle memory for each OS much better. I pretty much have exclusive keyboards for different OS even if I use VMs on my laptop.
Plus, after much searching, there is not a good non-Apple keyboard for the Mac and the Apple keyboards aren't good for Windows. One example: the right side of of the left ⌘ key should be vertically flush with the right side of the X key. This makes it much more natural to reach for all those ⌘ shortcuts (particularly ⌘ + r and ⌘ + t, and for me I have many ⌥ hotkeys setup with BTT). On most Windows keyboards, Alt is left of Spacebar, and Alt's right side lands vertically on the middle of the X key, not on the right side.