Why not do both?
Start with water and let the film rest there for a couple of minutes. If there is any increase in acutance from enhanced edge effects with a water stop bath, two minutes should do it.
Next, pour the water out and pour in an acid stop bath. If it is true that the acid bath prolongs fixer life, you are covered.