Nice stems and they look and probably fit much better than the originals.

Your water bottles look about right to me. I drink a lot of water since I got a kidney stone about 10 years ago. My doctor told me the best prevention was drinking a lot of water, and I sure don't want to go through that ordeal again.