PC keyboard maps Command and Option to the wrong keys

hi,

The Option and Command keys are reversed order when my Macbook Air is connected to an external wired PC keyboard connected to my dock and KVM switch. Is there any way I can fix this so those keys work "as expected" to my touch typist muscle memory?

My fingers expect the order of the keys left to right to be

control - option - command - space - command - option

The keys work as

control - command - option - space - option - command

Usually, I use my Macbook Air off the dock with its builtin screen and keyboard. So I don't want to re-map anything permanently that will cause it to malfuntion off the dock.

I've already tried Specify a keyboard type on Mac - Apple Support and System Preferences > Keyboard > Input Sources > click the '+' and adding US International PC

Lastly, I do not have a problem when I connect my Macbook Pro to the dock. The order of the keys work as expected.

Thanks.