My general feeling on this is that in both cases, you'd prefer the level of OD to the level of JS. For the PG, I'd almost even look to drop another level lower on JS if needed to get more OD, if you're looking for more effectiveness in the long term. I would probably trade some JS for more JR on the SG as well, and maybe even drop a level of passing to get the JR. Something like:
PG:
11/10/17/14/14/15 - X/X/X/X
and for SG:
16/15/17/14/15/13 - X/X/X/X
Though I didn't run through cap and salary calculators, and the SG build would definitely see a pretty big salary jump from that build.