What I did was to simply remap Command to Control in the built-in keyboard settings. I don't know if that would solve your problems with shortcuts, but it solve

What I did was to simply remap Command to Control in the built-in keyboard settings. I don't know if that would solve your problems with shortcuts, but it solved mine. Muscle memory remains intact. The physical key combos on the Mac are now largely the same as on Windows or Linux.