Electrical work is easy, unless you over think it...
Here's what I would do...
Remove the seat and fuel tank, so you can see what you are doing.
Remove the battery and connect your "fluke" meter to the leads, and place the meter setting on continuity (so it makes a sound when the circuit is completed)
Put the fuse back in, which should start the meter beeping because of the short... Right!?
Personally, I'd open the headlight shell and see if a skinned wire is grounding out somewhere. It's easy for that to happen inside the headlight shell and of course the shell is grounded, so it becomes a dead short. You can also disconnect the power feed wires to each of the switch blocks from inside the headlight shell , so that would break the circuit (and therefore test them for the short) for any of the switch block circuitry. (Meaning if you disconnect the hot wire and the meter beeping stops, then you are on your way to tracking down the shorted circuit)
My Capacitor used to short because of the way it hung down and the contacts were exposed. I eventually cleaned that up and shielded the connection and it's all good now.