Stop thinking of music from a technical standpoint.And just figure out what sounds good.Meaning don't look at scales and modes as "how much o these can I add in to make big complex solos".Look at it as each scale is a tool pull out the tools ou need to make the sounds ou want to hear.
Use your ears to listen not a book.If your haveing a problem running out of key or what not then figure what notes you need to replace to make it sound right,ut at the same time figure out what scale these"new good notes"asociate with so you can recall them on a future similar sounding chord progression.
Eventually through trial and error you'll figure out exactly what scales fit over what chord progressions.Its all expieramentation unless you plan on learning theory top to bottom and examining every chord progression our going to play over,take for instance barre power chords(5ths)no minor or major,you can be playing these but depending on how arrange them can make the solo scale minor or major.
Soloing comes from the heart it isn't a bunch of book theory strung together.Listen for what you want to hear coming out of your amp.