Just curious -- which diesel heater?
Also, you didn't mention the issue with your winch, but this resource might come in handy. I passed it the other day and thought "good to know about"... http://www.norwalkelectricmotorrepair.com/