It sounds like you've a good plan going.
I rotated all of my stored/bottled water today!
Hoping others find it useful too

For bottled water I user 5g jugs for my hot cereal in the AM for instant-hot and always keep 3 of those on-hand, and also we use 1G .89/g Crystal Guiser (sp?) from Winco for the rest of our drinking water. We go through roughly 6 gallons a week between the two of us (for good/drinking) and always have approx. 20g 1g jugs, and the 3 spare 5g jugs in the garage. We live within walking distance to the Sacramento River (well Folsom Lake & the Outlet[Lake Natomas]) so we are lucky enough to be by running water

-Todd