'Chord tones' and 'extended chords' are a more useful approach than 'scales'- even if they amount to the same notes. I read some
theory tips by Carol Kaye when I was first learning to play that talk about this approach. The nice thing about chord tones is that understanding the chord you need are working with, rather than thinking about a scale, gives you clues about which notes you can emphasise, which passing notes you can get away with, and which you need to avoid.
