Please understand music waveforms are made up of sine waves. Yes they don't look like sine waves on the scope but they really are a bunch of sines waves with different fundamentals and harmonics. If you are trying to make the point about the significance of IMD (that cannot be done with a single frequency sine wave) in addition to THD, you have done so already, so don't begin to confuse the issue again.
Just a side note, even mid range amps are generally well designed and built enough that THD+N/IMD are really not an issue, especially when you consider the much weaker link, namely the loudspeakers, that typically have much higher distortions.