At o e point I was switching between Windows and macOS computers on a daily basis. One way to ease the pain of control vs command is to remap your caps lock key to command in macOS and to control in Windows.