Start with chord tones
The most important notes in any scale are the ones that are also in the chord — the chord tones. They're what makes your solo sound in the music instead of like random scale practice.
If you want to drill chord tones specifically, the Arpeggio Finder shows you the exact tones for any chord across the entire neck.