iTunes Match matches wrong version of tracks
(This question has been asked before, but the usually suggestion solution - convert to AAC - doesn't work for me.)
iTunes Match has matched several tracks in my library with different versions of the tracks in question. This is nothing new, and as I understand it the matching is done using an audio fingerprint, so obviously with a bit of 'fuzziness' in this matching process, mis-matches can occur. For example, (one that is particularly annoying to me) Diamond Dogs by David Bowie, track 2 of the Diamond Dogs album, is matched as the single version from ChangesOneBowie with the fade-in, which ruins the gapless transition from the previous track Future Legend (grr). This is despite the metadata for the source track being track 2 of the Diamond Dogs album, but I'm assuming metadata is ignored for the purposes of matching.
In terms of rectifying this, and other, mis-matches many of them are direct-to-AAC rips from CD, so the usual accepted answer won't work for me. Is there any other way of sorting this out? Is it be possible to add an inaudible watermark of some kind that would disrupt the audio fingerprinting, and how would you go about this?
If anybody has had any luck with this, I would love to hear about it.
MacBook Pro with Retina display, OS X Yosemite (10.10.5)