You say the heater gets warm when the car is idling. I would still be changing the thermostat just to remove it from the equation, as its a cheap and simple thing to do, and may well fix it.