For me I have, and use the following as needed:
Large water storage for canoe camping and around fixed camps I have an old MSR 2L Dromedary bag. Hard as nails, caps a bit fiddly but they do newer lighter models. Handy to loan to friends and to hang from a tree.
I've updated to a 4L Sea to Summit WaterCell which is a more thorough design than the the MSR. Cap fiddly but better and a little bit bigger so less refilling. It's also great for a little bit of trimming on a canoe.
For water filtration, I have the Grayl water filter. Great, easy to use and acts as its own reservoir to drink out of. I lost the original Kickstarter one but straightaway went out and bought a new one, the Grayl Ultrapress. Perhaps I should have gone for the larger version, the Geopress. 710ml versus 500ml.
Bottles, I use standard Nalgenes, I love the Glow in the Dark ones which were a godsend trekking in unlit tea rooms. I like the Pillid cap add-on as well as the aforementioned upthread, Humangear Capcap. They are bombproof and the Pillid allows a place for tablets.
As for pee bottles, I have an old beat-up Nalgene recovered from the Spey which has enough warning stickers to put even the most confused of drinking from it.