Tested the thermostat and it appears to open at roughly the right temp (82 degrees), allowing for inaccuracies with the kitchen thermometer I used.
It doesn't close 100% when put in cold water, but left alone long enough it will close up.
So, lack of hot air in the car would be a gunged up heater matrix I guess