I use to think about all the modes as separate scales. If the chord progression is all natural notes, C major or A natural minor, I now look at all the modes in that key center the same scale. I am try to see the guitar in a more linear fashion, like the way a piano player sees his keyboard.
This approach has helped me from staying with in boxes when soloing.
I also have been trying to play more to the chords, rather than the key center. Switching between major and minor scales as the chords change.