Holding 35L of water for 2 weeks drinking and 25L for 3 days flushing seems a bit out of whack
Drinking water requires more expensive containers, and some thinking around keeping it fresh (rotation & potentially some chemical additives like bleach).
Water is critical to life and so you want to be sure civilization won't return before you risk drinking random water. That said, I'd keep a camping water treatment instead (there are lots of options) since they take up less space.