Skoda MK2 crazy lights and water ingress

Hi

I am having water ingress issues to the point I think the car was flood damaged...

I have read threw the various posts about water ingress and how to fix the leaks and repair the damage 

I have drained all water from the car, I have removed the comfort module on the floor and allowed it to dry out fully, I have repaired the crimp connectors on the passenger side, I have sealed the pollen filter housing, I have removed the drain plugs under the battery tray, and I'm still having issues 

My headlights, cluster, door lights, tail lights go dead when driving the car, only for a few seconds but still I cannot drive the car like this 

I'm no stranger to electronics and I understand the function of the canbus system I'm just here to find out if anyone had to replace any modules to fully fix the problems

I am also looking for a full wiring diagram for the interior of the car to understand where the canbus lines run to and terminate. 

Also a diagram to show module locations in the complete car would also be great

I also have NO diagnostic connection threw the OBD port but I did manage to run a VCDS full scan when I got the car which I will post here if its needed but nearly every module pointed to cluster and comfort modules having no communication and comfort module was running in single can bus wire mode 

Hope someone can shed some light as I have another Skoda MK2 with a rust problem but no water ingress which I could change all modules over from if I needed to 

Thanks,

Dermot