A lot of questions and articles about this but I can't find a one that works on my system.
Modifying emacs configuration looks working on other people's but it doesn't work for me.
(setq mac-command-modifier 'meta) ; make cmd key do Meta
Is this working on your system too?
Currently I have no idea except just swap thos two keys using by third party app which I don't want to.