Looks correct to me! Yes, you could swap red and green if you find it's tapped with the switch down and full output with the switch up.
On the tapped p90s does the wire braid still need grounding as well?
I've never seen the cable on a tapped P-90. Is it a metal braid with the 3 coloured wires inside, or is it a plastic sleeve (like a 4-conductor cable) with 3 coloured wires plus a bare wire?
Either way, the braid (or the bare wire) should also go to ground.