I have made a little system for myself that seems to be working. I broke it down into 3 main parts.

Part 1: I run thu strumming these chords Am, A, B, Bm, C, D, Dm, E, Em, F, G. I go thru them in that order and then backwards to work on remembering the fingering, work on transition between chords, and also working on making on speed.

Part 2: I run the the notes starting at low E and end at high A. I do this in 2 octaves. This is getting my fingers used to moving, getting me used to hitting the notes without having to study the fretboard, and also putting the notes into memory.

Part 3: I play some various songs that focus on different parts. Pink Floyd songs for some solo work and also chords and some Santana for note work.

I am also slowly working my way thru guitar fundamentals 2. I am not wanting to rush myself thru it.

Now, I know your more advanced by far them me, but this just shows my method of staying on track and feeling like my time was not wasted.