I'd focus on learning intervals and interval shapes to navigate between strings effortlessly.

Knowing that the 5th of G is one string down and two frets to the right and that you can play the root note moving a perfect fourth up (4 semitones/4 frets) or that the 2nd is always a string below the 6th helps a lot when you're soloing, visualising the diatonic notes for a key like that is fundamental, then couple that with knowing that a minor scale changes by having a flat 3rd, 6th and 7th, you can do this for every scale just know which intervals make them.

this is important when you plan on playing horizontally, it's way better in the long run trust me, rather than just memorising 5 shapes, memorise the intervals.

if you truly want to navigate the fretboard without second guessing you have to get to know that and the sound of the intervals.