I suggest Kathmandu (or similar) for the water bottle. They sell metal ones in various sizes, and they're very strong and very light and won't give you cancer. I think they even have ones that are the right shape for bike holsters. They also sell pretty good Camelbak water bottles, but they're plastic, so might give you cancer?