As you've mentioned, better cages will make a world of difference.

Also, I think you're looking at a carbon fiber version which is certainly overkill... You can cut the bta bottle price in almost half with the 200. https://www.amazon.com/gp/product/B018YIE078

Granted, you still have to add tri bars first which is yet another expense..

All a long way of saying, "good job in ordering better water bottle cages!"