It looks like you're new here. If you want to get involved, click one of these buttons!
The trouble with using scales as a basis of what you play is that you can move from one rut to another. By all means learn the modes and then use the CAGED system, or similar, to discover where they are all over the neck. But, as far as creating interesting solos goes, @bwets has given the best advice.
First of all learn melodies (any songs will do) to the point where you can hit all the right notes, anywhere on the board, without hesitation or fluffing. Then use that ability to create solos in your head, as @bwets suggests, and simultaneously play the right notes. It takes a lot of practice but no more than endlessly learning scales and your solos will be a lot better for it. No more ruts