When you plug a new one in, you have the option to run through a "layout detection" process. Typically it asks you to press the keys directly adjacent to the "shift" keys and goes from there. Also, IME, there is not a "mac" keyboard on a hardware level - the key directly to the left of the space is alt on Windows or Command on OSX.

This process often gets it wrong in my experience

Yep. If you plug a standard keyboard in it works almost perfectly.

The only oddity is the Option and Command keys are swapped. They map to Alt and Windows, but should be Windows and Alt.

Trivial to fix it in the keyboard Pref Pane. Otherwise you’re 100% golden.