This has helped me a lot reading this post. I know, that I also fall into the same trap. It's easy to play from muscle memory. You build up a vocabulary of licks and chops, just like you would words while speaking.

Hopefully, you make these your own, so you have your own voice. (If, not, give it time, change them up a bit)

It's how you arrange them, and mix them in with basic melody. A solo should have a common thread of a melody or a path that you are walking on. Now try to embellish it with a few of your chops. Don't blow your whole load on every solo.. don't play every one of your techniques and chops in every solo, or they will all sound the same.

Just my thoughts an 2c worth, for what it's worth :)