The shapes, both major and minor ... deviated from the pentatonic pattern because I’m thinking about how I might embellish a G chord, rather than playing notes from a scale.

Compare the intervals of the major scale and the ... It even contains the notes of the good old minor pentatonic scale, so you're in friendly territory for noodling out melodic lead licks here.