Honestly what I would do is spend a good chunk of your time drilling chord changes:

1. Pick two chords
2. Slowly finger one chord, lift your fingers up, then put them back down in the proper positions all at once. Move as slow as you have to.
3. Then do the same thing but switch back and forth between chords.

Doing something like this hundreds of times a day will really cut down on the time it takes to learn these chords.