basically echoing what chrisweyers is saying, another strategy is to familiarize yourself with the location of the chord tones and use these as anchors.
Learn the arpeggio fingerings (but don't fall into the sweep picking trap yet... this is just to visualize the chord tones) and make sure you can start and end a phrase on those notes.

That will lock the solo to the chords.

If you can play a solo even without backing chords and the listener can still hear the chord changes through the clever use of chord tones, that's when you know you've got is worked out.

Combine this with rhythm and phrasing and you should be sorted.

hope that helps a bit