Before you go to the trouble of ripping the dash etc out to get at the heater core, try backflushing the core out, i did it on my old 120Y and it came good again,i have 2X R31s and altho its a little hard to get at the heater inlet/outlets in the engine bay due to the proximity of the inlet manifold, its worth a go, PM if you need more guidance