When I ran into this type of problem I went back to "spider" type finger excersizes to refresh muscle memory as to what finger was on which strings and wherefingers were and also began making my own chord diagrams, by writing in the diagram it reinforced the "shapes".