It sounds like you've a good plan going.

I rotated all of my stored/bottled water today!
_________________________
QMC, USCG (Ret)
The best luck is what you make yourself!