Not sure if this helps, but here is my thought...
I used to sell restaurant equipment and supplies. Every once in awhile a similar need came across. I had best luck with specialty bottle companies, especially if a wholesale supply was needed. They may or may not sell direct. If they route you to a vendor, he probably pays 40-50% of list cost as a guideline for your negotiations. If they sell direct, ask where the quantity for the price breaks are at. Also ask if you set up a corporate account if they will readjust the price if you buy X amount during a 6 month time period or so.
Couple of the bigger ones...
Glass
http://www.specialtybottle.com/index...ROD&ProdID=141
Plastic
http://www.usplastic.com/catalog/ite...FcQ32god6F4I0Q