+1 on the Maxped Sabercat and, if you want something smaller, the Proteus.
With both, I use Maxpedition's small rollypoly to hold my water bottle.
Same here. The Mini Rolly Polly fits a 32 oz. Nalgene perfect. Adds a lot of weight though. (Full Nalgene that is)