Have you checked for a vacuum line leak to fix the heater problem? And the idle does sound a little high(not going by the tach) which again may be a vacuum leak.