Yeah based on the info you gave there i probably would not wire that PSU through those small wires & switch.

Yeah your drawing looks good that is how it should be wired.

Cheers

Alex