Nightmare electrics on my D2.

[mattk]

Got soaking wet in the rain we had a few weeks ago. Found the orange rubber drains to be the culprits. Ever since the hazard lights will no stop flashing. I have tried a new hazard switch to no avail. I have driven the car with the hazard switch unplugged and it drove OK for around 5 mins. It cut out. Started again OK and drove again. Cut out again... no real correlation to when it cuts out but putting it into N turning off and on again sorts it. I opened the boot earlier, the dash showed the boot to be open as usual, but then when the boot was closed still showed the boot open. And what's more the other day the interior light was on with the doors closed, when I turned it to the off position the engine cut.

This is really doing my head in. I was very close to scrapping it at the weekend. Thought I would have one last ask here first.