Stephen,

My one suggestion would be to replace the S-biner with a locking carabiner. I have had the s-biners come off with just moderate activity. I use the MOLLE compatible Grimlocs like this. They attach to any one inch webbing, are easier to unlock using just a finger tip (even gloved) and will break away (at about 80 lbs of force) to keep you from being hung up or strangled if the gear gets caught on something. Never had one break, come open accidentally or fail in anyway. There's also a simple D-ring version as well. They're made of a plastic so won't rust. I've carried my water bottle on one for several year and have never had it come loose.