Electrical – Use a 3-gang box for 2 switches and feed to outlet – to have more space to play – ok

Since your light is on a different circuit than the outlet, you'll need to run a switch loop from the light to the 2-gang box using 14/3 (yes 3) cable, with black as the hot, red as the switched hot, white as a spare neutral, and the bare or green wire as well, the ground (aka EGC) :)

In the light box, you'll take the black that currently goes to the fixture hot and connect it to the black of the switch loop instead; the fixture hot then gets wired to the red wire of the switch loop. The switch loop white and green wires get wired into the existing white and green wires coming into the box.

After transposing the existing GFCI from the old 1 gang box into the new 2 gang box, you'll want to leave it alone from here on out. To wire up the switch, you connect the brass screws to the black and red wires, the green screw to the EGC, and simply wirenut off (i.e. put a wirenut on the exposed end of) the neutral on the switch loop -- it's there for future use by say a motion sensor or lit switch as per 404.2(C) (neutrals are called 'grounded conductors' in the NEC, btw, if you're a Code newbie and scratching your head at this :):

C) Switches Controlling Lighting Loads. The grounded circuit conductor for the controlled lighting circuit shall be provided at the location where switches control lighting loads that are supplied by a grounded general- purpose branch circuit for other than the following:

(4) Where a switch does not serve a habitable room or bathroom

First off, you do not need a separate tail to the box itself. Typically we'll wrap one of the grounds around the box grounding screw then on to the splice.

Personally, I use ground crimps. I twist all the grounds at the point I want the crimp, then I leave tails for the number of devices in the box, and cut the rest off right at the crimp spot, then put on the crimp. Now each device has its own tail and the spice is nice and neat and small.

Another option is to use a green wire nut, the one with the hole in the end. Twist, and them cut off all but one long tail and put the wire nut on. This tail will go to one device then on to the next in one continuous piece.