I think for this kit I am going to not concentrate on water storage, and use the space/weight that the water would take up and replace it with a filtration/pump/purification solution, plus some collapsible containers to store water that I may have purified.

I think I will keep storing water to a minimum, because if I cannot find water I am in deep doo doo anyways. Possibly just take enough water to get me outta town or to a suitable shelter location. (canteen/gallon in car/couple 2 liter bottles. etc)

This kit is big... either for sheltering in place, or to grab and throw into the back of my vehicle. (which should have sufficient water stores for a lengthy trip anyways)