I'd try chemically cleaning the heater core, I do it often on all makes of vehicles. I have been using CLR with good luck, I'm gonna try VC9 on the next one.
Just remove the heat hoses from the engine, then flush with a garden hose both ways, then I blow the water out, add the cleaner let it...