A water bottle of the right size I found is much more important than it seems. I had pretty much the same experience that you mentioned: too big and I don't use it, too small and I can't be bothered to refill everytime.