What we (ok not we, but the pros) need is for the aero frame mfg'ers to integrate the bottle into the frame and include it with the frame. They need to keep the downtube aero but have it cut out at the waterbottle and have a flat back, then design the bottle to finish off the airfoil-profile. Maybe even integrate the cage into the frame. It would look wierd, and be expensive, but it would be faster.