coolant flush, heater core flush and new thermostat should fix it.

I recommend the coolant flush if its never been done before, otherwise replace the thermostat and bleed ALL the air out.