You could try back flushing the heater core.