Watch the SECTION 3: Creative Scale Approaches online guitar lesson by Shane Theriot from Solo Mojo
In my opinion, mastering chord tones and the major scale patterns are of the utmost importance if you want to have total command over playing across chord changes. I tend to think as chord tones and the "sweet" notes of the modes as colors or flavors. Once you know the patterns you need to be able to know where the "juice" lies in each mode or chord tone. We'll also look at the melodic minor scale and "superimpose" the sounds over common chord progressions.