Tidbit about scales and chords that might make your life easier (it made mine easier when I figured it out)
When learning music theory, it helps to view a scale as the fundamental basis of everything you're doing (well, unless you're playing metal...but learn the fucking rules before you break them, so you can break them in more spectacular ways). A lot of people learn how to create a chord progression and THEN learn how to play the scale that it fits into. I don't really understand why people are taught about chords first; if you know a scale, you can take the basic image of the scale as it would fit on the fret-board, and instantaneously know whether a chord uses the notes of that scale by mentally fitting the chord shape to the scale pattern. Being able to mentally carve a chord shape out of a scale pattern becomes easy as hell after a while. It quickly became second nature to me...Make sure you learn the names for all the chord shapes you're using, and learn what every note on the fretboard is, and if you can take a newly learned scale and say "Oh, an Am7 would fit here" or "Oh, a diminished chord would fit here..."