I have a Camelbak and I like it for my long rides, but I wouldn't want to carry it everyday while commuting. Have you thought about getting more water bottle cages? They have some that go on the saddle, handlebars. If you have room you can put one on the underside of the downtube.