I'm not sure I am a firm believer in Wash-and-Wax vs. Joy vs. whatever. I'm not convinced any residual wax keeps (especially wet) brass from tarnishing any faster. BUT, I got a couple of big jugs of it cheap and see no reason to change either.
I do think that using far more soap and citric acid than is necessary is the norm - my experience tends to be less is more, especially when combined with drain cycle(s).