One thing you want to start thinking about is this concept of "Chord Tone Soloing." Scales and modes are very essential to the guitar and having an understanding of how they work is key. But, don't let this concept stump you if you don't feel super confident about it. Another way to work with soloing that is outside of this concept is playing chord tones of the chords you are playing over. You can never go wrong by playing solo melodies using only notes of the chords. This is assuming that you know the notes on your fretboard some what, and you have a basic understanding of what notes are in some basic chords. For example:

Here is a progression with a 4 chords;

G / Ami / C / D

You can sit and wonder what scales to play, etc.; but especially in the case of simple chords like this, playing 'chord tones" will really sound great. Here are the notes that make up each of these chords;

G - G, B, D
Ami - A, C, E
C - C, E, G
D - D, F#, A

When each of these chords come up, only play notes from each chord in your solo. Trust me, it will take a minute to simply work up the discipline to work through this without wanting to noodle around (as I often do as well.) But, I guarantee if you work through this your soloing will improve and sound very melodic.

Keep working through your scales, modes, etc. Those will always help, but keep this concept in mind as you practice. At the end of the day you want to "say" something with your soloing, and this will help you get there.