Sounds like a plan. While I had the stalk out, I used a screwdriver to bridge the center contact with the contacts on either side of it and the system worked fine, so my assumption was the switch worked fine but there was something further along in the circuit that wasn't bridging it properly.
EDIT* Although now that you mention things popping... I had my left hand headlight die around, if not at the same time, as my running lights failing... but my headlight fuses are perfectly fine. Possibly a bad earth around the headlights?