Try thinking of your "solo" as if your guitar was a singing vocalist. Most solos are constructed over either the verse or chorus of a song (less often over bridges). Try phrasing your solo as if it were singing another verse (or chorus or bridge) in the song. This will help your solo sound as if it belongs in the song and will give you a foundation for building future solos as well.