It might be worth checking the water control valve attached the heater box under the dash, I had one that leaked, despite being a new old stock item, around the central rod that moves the internal valve to control the flow of hot water. Not too difficult to fit, but if you do change the matrix it may need replacing too.