In my case, I'd go with the two liter bottles... they're much more portable, they're easier to stow, and if you want to "donate" to a neighbor, you don't have to hunt up a smaller container.

Troy

P.S. There's also the point that, if one of your containers develops a leak, you've lost two liters, not five or thirty gallons.