Another book worth a look is Arnie Berle's Chords & Progressions for Jazz & Popular Guitar - it forces you to think which notes are which within different inversions and the chord's construction (rather than simply showing you the shape/name), and there's lots of progressions to drill through - takes a jazz approach of generally avoiding doubled notes, barre chords get dropped very early on.