Regarding water bottle capacity, my frame is much larger than the OPs frame, so this probably would not be much of a solution for the OP, but I have three of the one liter sized disposable Smart Water brand of bottles on the bike in the photo. Only their one liter size fits in standard bike cages, the smaller ones do not fit. But I bought them to use, not dispose. They are great water bottles. A few other brands use a similar shape one liter bottle that also fits. The flip top lids that I have on two of the bottles came from other bottles.
