I like the idea of a diode with a NC switch across it. I'd like to try that one first. Regarding snubber circuits, I have used them in the past across arcing contacts in AC switching equipment. A typical configuration was a .50 ohm wirewound resistor in series with a .10uf cap. What was it you were thinking of for across the diode? Lenny