See if you can feel the hot water lines near the little pump/motor near the battery. Are the ones that feed the heater core hot? May be the pump/motor assembly needs to be checked out.

__________________
Jim