For a different approach, really listen to what you are doing with basic song structure like your chord progressions, then hum or sing solos to them in your head. Something you have found should stick or at least make sense musically. Try and then translate that into your guitar solo. Listen to great Jazz musicians like Miles Davis and John Coltrane and get a feel for improvisation. Listen for the notes and phrases that the greats use in passing and how these relate to the "hooks" and the climaxes of the solo. You don't need a music degree to improvise but you do need feel and emotion (well they are basically the same thing).

If it doesn't sound right to you then it probably wont to your audience. Become a critical listener of your own music. Try and relate everything to a feeling rather than a scale or a pattern but keep practising those aspects to develop you "chops" and dexterity as a guitarist. When feel clicks with ability (not to mention a multitude of variables that contribute to finding a good tone) you will have something. Good luck!