I agree with all the mentioned above, a nice tool that can speed up that muscle memory process is implementing a forced change.
So for instance, get used to swithing between two chords, and after a while try to force yourself to switch between the chords by using a metronome for instance. Set...