This is said in the tone of support, not talking down to you.
Get rid of the cages entirely. Aero disasters.
Do a narrow and slender top tube bag w a Platypus bite valve bladder, zip tied up to your bars. Magnetic clip & sip if needed, but can probably just bite & sip from it.
I’m in the process of converting to this system for a long race, and when I tossed the idea, which I assumed was stupid, to the crowd, some very (way more than me) intelligent people actually chimed in to encourage me to try it, and that some semi-pro had rocked up a rig like that for unbound 2023 and killed it.
Just my two worthless pennies! Good luck and mad love!