Water in foot well- any advice please

[welchdc]

Guys
I am after some advice, following from finding water in foot-well in my garaged 1989 S2 and none in the cooling system. I've checked all pipes and connections and all looks ok. The only part I cant check without dismantling the dash is the heater and its matrix, but I think that's the problem.
I am guessing the heater matrix is shot, and hence leaking. I know to change this requires a complete dash removal, but before I start doing this can I ask the following -

1) Can I get a new heater/ repair the heater matrix , if so where from and approx cost?
2)I only use my S2 in summer, hence no need for a operational heater, therefore is there a quick/ easy way to bypass heater without causing any engine over heating problems and removal of the dash?

Any advice will be greatly appreciated.

Thanks
Dan

[welchdc]

Guys, thanks so very much for your reply's and thoughts, I think following your advice I will bite the bullet and take the dash out and try to repair properly, as I know if I bodge it, I will not be happy.... thanks again, will let you know what I find!!!