Sounds like you have it under control.

FYI in case you ever want to use normal size bottles: I've been using the Soma polypropylene water bottles lately. I also hate bottles that taste like plastic. These don't taste like anything, and are pretty much the same as Nalgene, but you can squeeze them.
Crystal Polypropylene Water Bottle | SOMA Fabrications