Cmd as main modifier is lost battle. I've tried it multiple times. In the end just accepted ctrl life and sold my last macbook.