Nice work mate
Ref the water - If its coming under the dash on the passenger side I would point you at the air in let under front windscreen, if you take the outside plastic covers off between the windscreen and bonnet there is a plastic strip on the back of the passenger side one, I have seen those damaged or snapped off, that allows water to run in through the inlet, it then drips down from the fan in front of the passengers knee.
Hope it helps