Dev man, no wonder you're confused. Once you get beyond all the theorical stuff, you'll realize that there are only three basic sounds you improvise to: major, minor, and dominant. All the augmented, diminished, and altered scales/licks apply to dominant (G7, C7 etc...). Everything else is either major or minor. Good luck man