A fly-back diode is only there to supress sparking across the switch terminals when an inductive load is switched off.
[/quote
Just a thought - if that's the bit that's failing would the fitment of non-inductive load bulbs ( LED upgrade bulbs opposed to filament bulbs) not solve the issue from happening?
