How to add GFCI-protected switches and lights to a 2-wire garage circuit
Your first diagram is almost correct.  The receptacles need to be wired in parallel, but so do the lights. The lights can be GFCI protected, but they're likely not required to be (unless they're in a shower in your garage).

Something more like this



You also need a neutral at the switch, even in you don't use it. So it might look more like this.