If you have heating issues the water temp sensor will not give the ECU correct information to correct the idle. Although your idling figures suggest that this is something other vthan the sensor.

Get you heating issues sorted out first. Then go from there.

I have a leak in my cooling system ( plastic neck broken off from radiator). The idle and fuel consumption is all over the place. But the idle is not as bad as yours.