Thought I'd chime about using the chord tones again. I started practicing that way a while back and it really improved my soloing and phrase construction.

I do practice scales and other peoples solos for technique, but concentrate on the chord tones to create my phrasing.