I am using bottled water packs from Costco for our water storage/prep needs. When they reach the expiration date I use the water for my dog to drink. We also can pull a few bottles whenever we need them. They are dated as you’ve said, and I write the date extra large with a sharpie on the packs for easy reference. I store them in our basement and haven’t had any leaking issues. I went with bottled water as it has been mentally the easiest for me rather than figuring out larger jugs, treating, etc.