You could do a titrated acid wash (I'm sure the info is on the wiki), this way you only add the required amount of acid for each batch, it takes all the guess work out of it.
That said I don't routinely acid wash anymore as I rarely need to, if the first wash does form an emulsion it's easily split with acid anyway, and you get to know how the reaction has gone and if it's likely to give washing problems.
I add 30ml of acetone to my wash water as this reduces the amount of washes needed, I normally only need to do two pump washes.