On Sierra (and previous versions) I just use System Preferences - Keyboard to swap the Cmd/Opt modifier keys around. Need to do it once for each keyboard I plug in.
Karabiner (formerly KeyRemap4MacBook) is the best keymapper for macOS I have heard of, but not needing macros I have never used it.