Good progress report. Congrats on all that! I know my brain isn't big enough to rule the fretboard. So I've stuck with major CAGED scales, the usual minor key scales, mixolydian scales, major and minor pentatonics, and a few voodoo/swamp/gypsy/Celtic scales I've stumbled across. And I mostly use melody just to dress up chord changes. Life's short! And luckily for my music, I'm a pretty good lyrics guy.