Odd trick: if you have HQ MP3s, and you want them to get “matched” instead of “uploaded”, transcode them to iTunes Plus (256kpbs constrained-VBR max quality AAC) format. iTunes will then be far more likely to get a fingerprint match, for some reason.