I think that learning one-string scales will also help you a lot, because you can use that to link together the various scale patterns. Legato on one string is an art form all to itself, so take one scale pattern you know, play a lick, and link it to another scale pattern via a one string scale and then do some licks there.

Also, I would say that while being able to move around is very important, I think that many players lack the vocabulary and phrasing to do it well. The NUMBER ONE most important thing, in my opinion, in soloing, is the phrasing. This will give you a voice and unique musical identity to which people can relate.

As you are learning these new ideas and skills, focus on how it will help you make phrases. Guitar Players like Prince, who only uses 3 of his 4 fingers to play, make it onto 100 greatest guitar players of all time lists and such, based solely on their phrasing. I mean, the guy doesn't even use his pinky to play. Like, literally.