My wife started complaining about how marked up my water bottles looked from aging aluminum cages. I told her to get me some King stainless steel cages for Christmas.

She did. Problem solved.

But almost anything at your bike shop will work with standard water bottles. And if you need to carry more water, get a collapsible bladder or two, fill them, and stick them inside your panniers. That'll keep water more tepid (less hot) than normal bike bottles.