I use https://github.com/andymcd/cmd-key-happy which swaps option and command, and which lets you whitelist keys (iirc Cmd-N is among the defaults) to be exempt from that swapping.