Faced with a similar situation Ergon GC3 grips/bar ends have worked for me

-- a bunch of hand positions without as much of a re-organization project as trekking bars or drops

-- after some trial-and-error I have them in a position where I can put my hands on the ends and rest my forearms on the grips -- not as comfortable as an aero-bar set up but gets me through the worst headwinds

-- in my view, Ergon grips are expensive but worth it for the ergonomics

An option to consider.