I haven't been to shades since they reopened, but the gift shop did have diapers the last time we were there. I don't know about gallon sizes of bottled water, but they did have smaller bottles of water. I know that could get expensive if you are using it to make baby formula, though. The last time we went to disney (we have 3 girls 5, 18 months and 6 months) we just stopped at a little store on the way in and bought a couple of gallons of water. We are going to stay at shades next month so I will know the answers to you question by the end of Feb.