This may sound stupid, but I use to be a certified Tilesetter by trade. We use to use a diluted mixture of muratic acid and water to get rid of a lot of metal marks, discolouration, etc. May be this work in your application?

Terry