Your consumption of 1-2 litres/day of high fructose concentration water solution should be your main concern rather than any issues with regard to water storage in a plastic PET bottle. The Diabetes Mellitus type 2 will get you way before the BPA exposure will.

If plastic bottles concern you then just use 1 Gallon glass demijohns to store your water.

http://www.wilkinsonplus.com/invt/0022556