we do prepare working solutions of antibody stocks using PBS, HEPES or Tris buffers with 5 mM EDTA and the working stocks (concentration 10 - 50 µg/mL) for month or years at 4°C. Optionally you can add 0.05% Tween20. We do not freeze the aliqouts. For long terms storage i would not recommed using any of the "blocking" reagents, such as BSA, skim milk, OVA etc.
In my point of view, compared to the costs of the antibody the costs for the dilution buffer are negligible. Using a single buffer does however make things more simple.