I have well water and store it in clean gallon milk jugs. I just add 1/4 teaspoon of chlorine bleach per gallon and it stays good for at least a year.
As far as the filter, I've had real good luck with my Katadyn Vario. 90.00 bucks from Cheaper Than Dirt.
Sometimes I wish I had invested in the Springfield SOCOM. I've put all my $$ in AR's. I would have to have a "liquidation" sale, then TRY to find ammo for it.
Oh well, I guess I can still dream.
I'm extremely anal about my gear. I've been prepping for a few years now.
It sounds like you've got a good start on your preps, but don't forget to keep a Molle or Alice pack in your vehicle at all times also. The pack should include all the common sense items such as first-kit, a couple of...