The citric acid stop baths (e.g. Ilfostop) have a much less objectionable odour. I seem to recall, however, that there are some procedures where PE has indicated that acetic acid based stop is preferred.
My practice (with Kodak films) is to dilute my Kodak stop in two stages. I make a half liter of "stock" solution at a 1 + 7 dilution. Then for use, I dilute the stock a further 1 + 7. That way I am handling the strong, odorous manufacturer's concentrate much less often. The "stock" solution still seems to be sufficiently strong to prevent the growth of anything in it.
I use Ilfostop for printing, because it smells better.
I discard stop after use except when I have more film or printing to do within the next day or so, in which case I rely on the indicator.