I would recommend learning the pentatonic and major scale for all the shapes, yes. One of the reasons the CAGED system exists is to help you play chords, notes, double-stops, all over the fretboard quickly and easily. So don’t stop at the first one.
To answer your second question, the same...