If I could I would look at it for you, if you have a multimeter with aligator clips, clip onto a bare spot on the + at the headlight, and ground the multimeter out, and then get another one and probe at the switch.
Do you know if there is a relay in this setup? You may need a 30 or 50 amp relay, that could be all that's wrong.