Well, it appears that a water bath doesn't give me an advantage over an acid bath so I'll continue to use acid for consistent results. However, I'm experimenting with pyro developers and a water stop bath is recommended so I'll use water in those circumstances. Thanks for the responses everyone.