"Also I would love to give William Leavitt's A Modern Method for Guitar a shot, has anyone checked that one out?"
These 3 books are awesome ( books I, II and III). They were 'the' guitar lesson textbooks when I was in music school. Go through them cover to cover, and you will know your major scale fingerings, Harmonic Minor and Melodic/Jazz Minor scales in every key. You will know every chord coupled with useful chord progressions. Basic sightreading skills will be in tune, too if you get the copy that comes WITHOUT tab... Really handy books. Those Berklee guys, they have a handle on it...
I'm surprised no one mentioned the Jamey Abersold books. 'Must haves' in my opinion, if you are working on improve and want a really conducive 'right now' plan of attack in regards to improvising.