Try the singing along with your solo idea; it will slow you down at first but you will find it more melodic. Also, someone once said to me 'deny yourself twice'. Play a phrase and then, when y9ou want to play the next one, don't. Then, when the next one comes into your heard, don't play it. Play the next one and you will have edited 60% of your 'diarrheoa' and it wil sound more melodic (this is all in the practice room, not on a gig )