I've ventured away from "scalar" thinking and have approached everything as intervals, chords, and "expression marks", made sensible by phrasing and form. This formula/approach makes things more melodic to my ears. In fact, you can play anything if you have a good sense of rhythm. A wise man told me: "There are no wrong notes, only wrong resolutions"
Since scales = tonality:
augmented, diminished, whole tone, all consonant and dissonant intervals (including chromatic), and the notes in between the notes.
Pentatonic, hexaphonic, modes and all the beef stew broth (harmonic minor, harmonic major, melodic minor, etc) are all shades referenced to according to chord and atmosphere.
But if you're talking about blues... major and minor pentatonic stuff relative to the chord, using open voiced intervals as a basis.
