Since I've had this 2002 cooper the heater has never got hott and at first it was overheating all the time so I was forever filling it with water. I've changed the thermostat and it's mostly stopped the problem but the heater still doesn't work, could it be a water pump issue or maybe the heating matrix? Any clues pls