Ways to improve solo on guitar

I’ve been doing solo from different scales (pentatonic, blues..) and developing phrases from there. Recently I’ve been experimenting choosing notes based on the context and chords progression. Though I noticed the once I start to focus on the choosing ‘the right notes’ from chords. I don’t have the capacity to phrase any more. Does anyone have advice for this and ways to practice? Should a solo be outlining the chords or more on structures of phrases? Any advice is appreciated! Thanks