I signed up for iTunes Match. It matched most of my songs and uploaded the rest. I was playing one of my favorite songs and discovered it has a glitch at 21 seconds in. It is consistently there, even on multiple devices. Luckily I found I still had my copy in a backup, so I removed the song from the iTunes library and re-added it. Unfortunately it is one of the songs Apple "matched" so it keeps getting replaced with the glitchy version.
I guess I could try renaming the song so Apple doesn't keep replacing it, but that seems like a lot of work. What else can I do?