My heater issue turned out to be nothing more than 30 years of crap built up in the fins of the heatercore. Took it out, blew some compressed air through it a bunch of times, reinstalled, and hey presto! Except I didn't restore the weatherstripping around it, so there's cold air bypassing it and making the end result lukewarm. That's further down the Todo list...