I am very far away from there, but I will share something that seems to have helped me. Perhaps some of the experts (all those that have replied are included as are many, many more).
I have a large diagram (looks like a giant organization chart [somewhere about 6 ft long) of "common" and some "un-common keys" spaced across the top. Under each key I have a side by side list of all chords in those keys. Below each chord name I have a copy of a fret board showing note locations, strings and fingering of the chord above. Below the fret board, the strings continue and I have the note information of each string for the chord being played. This may seem weird and may not help your, of anyone else’s need, but it helped me learn relativity of keys, chords, fingering and notes.