Where as you don't want to simply play one lick over and over and over; it certainly helps to play a few licks that say a lot with very little (if that makes any sense.) Guitar players get a bad rap in this respect as we are all too often guilty of playing so much and really leaving the listener with nothing to grab onto.
You want to develop a "motif", or a central theme to your solo that is stated often and everything else works around that. The licks that you know really, really well should be your guide and from there play around those but keep hitting the listener with that main idea. I think the greatest solos have very singable melodies and playing a ton of notes can be hard to execute that.
If you are playing praise and worship stuff, it is really easy to communicate this idea as that music tends to be very diatonic (in one key), and you can say a whole lot with very, very little. Something you may want to try is try learning some of the vocal melodies from the songs you are playing and incorporate those. Develop a few core ideas (or motifs) and from there simply play around those. You really don't need to shred to play a great solo.
Hopefully this helps? :confused: