If it's actually hard water, diluted muriatic acid (or heck, even a strong vinegar mixture) should clean it up, no need for buffing.
If it's actually etched... definitely a lot of work. I've seen some threads that talk about needing to make sure to feather out any buffed/polished areas out to...