From your description, you may want to think of where you're at this way; you've learned the grammar and rules of soloing but you haven't learned the language of solos. That is to say that you've got the information part of it down but haven't really put together how to use that info.

When you speak, to convey an idea, you speak in commony used patterns and phrases to present your thoughts. You've done it so long that you don't even realize that you do this, but you do. It's not a bad thing. As a matter of fact, it is a good thing. If we didn't use common denominators (so to speak) in speech, we'd all be going 'wait, what did you just say'? all the time. Not unlike when you speak to someone that is just learning your native language, it's broken and awkward be cause they are speaking based on the 'rules' of speech but not really the generally uses phrases.

So, that said, learn the langauage of solos. That is to say that you should spends lots of time learning the leads of other peoples solos. What you'll see is that certain common themes and patters emerge. There is a vocabularly of licks and moves that is unwritten but as you start playing other people's stuff, you start seeing variations on common themes.

A good place to strt is learning the blues licks vocabulary. Southern rock guys of the 70s own this. Listen to the solo in 'Freebird'. We all think of it as a long lead but what it really does is evolve smaller themes as it goes. It's not a long raging, speedy run but smaller chunks of lead themes. This is where you learn to start buling leads.

So, food for thought. Scales are the parameters you use to build solos but they are not the ideas of solos themselves. Learn the language.