Hmm. it's possible that the hazzard switch isn't the problem, but EVERYTHING goes through it.
any chance you have loose ground wires? I'd focus on the ground bundle in the console, and behind the dash and make sure everything is clean and tight.
since you got an improvement with the hazard switch, I think it'll work itself out with a few dozen pushes on it. but if you NEED another switch, I've got a few.

__________________
John HAUL AWAY, OR CRUSHED CARS!!! HELP ME keep the cars out of the crusher! A/C Thread
"as I ride with my a/c on... I have fond memories of sweaty oily saturdays and spewing R12 into the air. THANKS for all you do!

My drivers:
1987 190D 2.5Turbo
1987 560SL convertible
1987 190D 2.5-5SPEED!!!

1987 300TD
2005 Dodge Sprinter 2500 158"WB
1994GMC 2500 6.5Turbo truck... I had to put the ladder somewhere!