aos, the noise measurement was a 20-20kHz reading.
Jan, your idea of more accurately simulating a real headphone load seems like a good one. I took it a step further and used a real headphone, a Philips HP550. I backed off considerably on the level and used 100mv which was quite loud with these phones, way too loud to put them on. Here's the THD measurement with a few different buffers:
1x 2001, 0.48%
2x 2001, 0.16%
1x 2002, 0.07%
4x 2002, 0.07%
2x BUF634, 0.07%
1x HA5002, 0.06%
The measurement is at 1kHz, but I also checked several other frequencies for each buffer combo including 20 and 20kHz and it was very similar. The first measurement is not a typo, and I tried 3 different units with similar results. In fact two of those were later soldered together for the 2x 2001 measurement. I then repeated the test with the same level with the Senn. HD580 with the blue Clou cable for the first three buffers and this time they all measured the same 0.07%. I also compared a 1KHz square wave with the single 2001 and a 2002 (back with the Philips headphone) and they looked similar with some ringing which had a slightly higher amplitude on the 2002. I'm not sure what to make of these measurement, but here they are for what its worth.