Custom frame only, moving current bike components, might approach new bike cost.

I second the idea of raising bars to where hoods and drops are both viable. At 6'3" my 60cm Domane is capable, but I have tall spacers making bars level, shallow drops, and aero bars on risers. Hoods, drops, and aero bars are all tolerable. I tend to ride aero bars whenever conditions allow, then hoods, and finally drops for something different. Options are good.