I've suspended this project for the time being, because of lack of a decent sound card for accurate HD and IM measurements.
A Waveterminal X192 for example, even after extensive modifications, wasn't good enough.
(Too much Harmonic distortion at 20kHz as well as I.M. distortion between the channels due to stereo DACs and ADCs. Aargh!)