I know the basic shapes of the major, minor and the pentatonic scales, where do I find the rest of the shapes (I hope I'm making any sense, if not, correct me)? And also, what is the next step in learning theory to take now? I'm kind of a late learner in theory, so I'm trying to catch up now and really digging into this stuff
Learn about chord construction, work out your scales over the entire fretboard instead of just shapes.
i'd say study up on intervals, good interval knowledge is to me, as valuable as scale knowledge if not more so, if you have good interval knowledge you can create scales on the fly (well chances are just about every possible combination of notes to be conceived has probably been used but you get the idea)