Windows is a bit more well behaved than OS X in this regard so swap them on Windows instead since the point is to not have to fight muscle memory. It'll take a bit of training to swap over, but then at least you're not having to swap between the two orderings unless you're frequently on other people's Windows computers.