I've done the same. I'm now EDC'ing a 26oz Kleen Canteen for meals, and a 500mL Gatorade bottle for drinking on the move, both full. The metal bottle is buried in my pack, along with my cook pot, and the plastic one right at the top, easy to grab on the go. I also have water tabs & filter straw in my FAK to make more potable water without a fire if needs be. (I also carry a 1L platypus to hold dirty water, if it comes to that.)