I think the ign switch may have been blamed in the past as well. Have you pulled and looked at the headlight switch for any signs of heat etc?