Depending on your version of MacOS, I'd recommend Karabiner-Elements for remapping: https://karabiner-elements.pqrs.org/