Totally agreed that water is extremely important. Most people do not give it the place of importance in their preps that they should. We have several different types of purification systems available in our preps.
Also, remember, filtration and purification are two different processes. You need both. For purification I prefer a system with a 1 micron filtration capability or less. Two microns will work for some things, but I’m just more comfortable with 1 micron or less.
We store both quantities of water, and are prepping to collect rain water as well. As far as bleach goes, don’t forget it has a relatively short self life. You are better off purchasing and using Calcium Hypochlorite in powder form for long term storage.