I think the headlamp switch is fine. concentrate on the wiring to the rear lamp sockets. Being as bulbs go out when you hit the brakes, i'd start by making sure you have good grounds on both sides and proceed from there.