Best bet is to open the wiring loom seperate the wires so you can see what is what and replace the wires and connectors to the lights, extra earth will help if in doubt. The issue seems to be resistance and this creates heat so bad earth, corrosion or bad connections should be rectified, maybe add a relay aswell but only after checking the above.