I'm getting to the point where I've just about got comfortable with the CAGED major scale patterns all over the neck - and I'm wondering where to turn next.

Relevant ojectives:

1) Get to the point where I can hear a chord progression and confidently improvise an articulate, expressive solo

2) Improve knowledge of theory to help get the songs out of my head

Note: I'm riff-based hard rock oriented.

Current Daily Scales Regime:

1 key* x 5 patterns x 5 reps (25 total) @160bpm

1 pattern* x 5 keys x 5 reps (25 total) @160bpm

+ general noodling

*rotate key/pattern each day

Note: this is /part/ of the regime - just the scales part.

Next?:

There are a whole bunch of places I could go next (in no particular order):

-explore links between the boxes, e.g. play scales diagonally

-deepen understanding of intervals within the scales

-build speed

-minor scales

-the pentatonic patterns

-etc

I guess my challenge is figuring out what best to invest in.

Specific Questions:

-Any opinions as to where to turn next, in terms of being most useful vs my objectives?

-Any other suggestions as to topics to add to the wislist?

-Any suggestions as to the practice regime?

Thanks!