A good place to start would be to learn a little modal theory. I believe this is a fundamental thing for intermediate guitarists because it turns the fretboard into a map and once you get it down you can see how most everything fits together. Hopefully I will put up a section on this, but for now, just search under 'guitar modes' or something like that.