Problem finding electrical short

Thanks for the info/instructions 67Dart273. Man what a wacky problem I'm having! I took the bulkhead connectors out of the firewall completely and metered (continuity & short check between conductors ) every wire, all checked ok. then I removed & metered the ignition switch ,the emergency flasher switch and the wiper motor switch. All ok. I am going to get an ammeter tomorrow and perform the current check you suggested. I'm now down to the headlamp switch that looks suspect. The resistive coil inside the white circular wheel is bunching up and the switch is not rotating properly. after reassembling the wiring harness and components, the short was still there . When I removed the headlamp switch, the short disappeared. Hopefully I'm on to something here so maybe a new headlamp switch is in order. What do you suggest? Is there any particular aftermarket replacement switch you could recommend ? Current one is an original mopar switch, p/n 2820782.