Re: soloing
Well, that should be enough to start doodling around, however, when you want to get serious and be able to rely on your knowledge of guitar and music in general to improvise, you'll probably want to keep indulging yourself with snippets of theory.
I know when I started out get interested in being a lead guitarist that I would memorize these little techniques that I could make cool sounds with. That did the trick for a while - it kept me excited. But after so long with not knowing where it comes from and why it sounds good and how to expand upon it, you'll find yourself acting like an old dog with old tricks.
That's when I started getting into theory. First, memorizing the fretboard. Recognizing the notes and the intervals between the notes on all dimensions, meaning horizontally and vertically. You need to learn the harmonies between certain notes. Know what sounds good over this chord and this one, you know? Scales can definetely help you with that, so I think they're always a good start.
From there, I'm sure you can find your own way to pick up on things.
And remember, don't be afraid to sound bad. Experiment with things.
PS: Be sure to think about what you want the solo to sound like before you pick up your guitar and start busting that pentatonic. This will allow to you step outside of your ordinary and get creative.
GOOD LUCK - and have fun!