Lee,
Might be worth checking if it is coming in elsewhere on the bulkhead, or is there is a faulty seal on the heater box.
In my service history there are reports of a leak from the bulkhead, and I believe they sealed up the joints behind the dashboard which rectified it.
It could be that the water is getting in via another route and then finding the heater?