I understand your pain. I was fortunate enough to study with Jimmy Bruno. He is one of the best jazz guitarists alive, and, in my opinion, the best teacher. He says scales and modes are nonsense. He will have you improvising over a simple jazz cadence in a couple of days and if you stick with him for a while, you will be amazed at what you will learn. Mastering his system is not easy, it takes a lot of serious study, however, it makes more sense than anything I have seen. He asks, "are you drowning in scales and theory instead of playing music?"

I suggest you take a look at his site and consider studying with him long enough to get a working understanding of his approach to learning guitar.

Jimmy Bruno's Instruction Site

Hope this helps,

Bill