It seems to me a larger frame may not be the only solution, but a different one could be, meaning a newer "Endurance" road frame. Every company offers many models of them. They have a longer head tube, shorter top tube, short reach bars. Giant Defy, Specialized Sectuer, Cannondale Synapse, etc. I am willing to bet a test ride on one may have you changing bikes.
This design puts a rider more upright. With your long torso it is a quick fix to put longer stem on bike to accommodate it. The short leg thing will be fine as the frames use compact design.

Go test ride one. You will be surprised.