i wanted to put this in my post beforebut i was tired and about to go to sleep.
the one book i think can help you get going to the guitar grimoire exercise book by adam kadmon. just about every exercise in the book is based on some scale. it also contains things like finger independence and string skipping exercises.
there is a whole series of books (the guitar grimoire) from scales and modes to chord theory. the only negative thing i can say about these books is they do not hold you hand. its cut and dry, nothing but the most basic of explanations on how to play the next part.
i personally have the scales and modes book (very hard to understand its just fingerboard patterns) and the exercise book (248 pages of will shattering finger brakeing exercises)
They say the END is near, but I'm Tired of waiting.