By replacement of the thermostat and water pump you have pretty much eliminated the engine area as the source of the problem. That leaves the non-original heater or a partially blocked heater core. By-pass the add-on heater and recheck. Login to read more.