Unless you've got water in the passenger footwell it's unlikely to be the heater matrix. Unless it's been by-passed in the engine bay it will still be leaking into the car and using a lot of water. Look to see if the control cable is working, this seems more likely from your symptoms. Still a 'swearing' job, but nothing like as bad as heater matrix exchange.