I do have a wiring diagram which I printed off The Samba, since my Bentley manual I ordered will probably never get here. The headlight switch seems to be wired correctly.
I broke my new headlight switch on accident, but it wouldn't have worked anyways. The front bezel that screws it into the dash didn't fit either the threads nor the hole in the middle was big enough for the shaft. I managed to pull the shaft right out, but it was just a $20 switch so I'm not too worried. CIP credited me for the bum headlight relay they sent, so I may order another. Or if anyone has an original switch I could buy that would work too.
I wired up my original headlight switch again, which doesn't work unless I bridge those two terminals (#30 and #56 in the diagram above). My high/low beams work when I use the original headlight relay.
Now onto the twang...when everything was working perfectly, anytime you would turn the key on or off you could hear a mooing sound from under the dash, one of the metal relays mounted under there...starter relay maybe. It did this since the first day I got the bus. Now it doesn't do that anymore, but if I connect my new headlight switch and touch a wire to those two terminals, my headlights come on and you can hear that relay clicking/twanging.
I am not sure what to check anymore. Functionally I have lights, thanks to a toggle switch and wire Fred rigged up, but I would like to get it restored back to working order. I would owe somebody bigtime if they could help me get it straightened out.