I personally like the bare minimum material removal. If its in spec, keep it stock. The pitting around the water ports just happens and have seen much worse examples do fine. A sacrificial anode will help keep it minimal. But I do know what you mean seeing a fresh surface. Go with your gut. Basically, I am no help at all. Curious about the M S as well. Maybe S W.