That's easy to fix. Use iTerm2, and tell it to remap modifier keys (to unflip them). If you use mission-control shortcuts (like move workspace), configure those keys in iTerm2 to "don't remap modifiers"