I would leave the shifting alone. Those top mounted self triming shifters were very cool. The part to adapt them is pretty obscure and will require hours of surveying bike shop parts bins and the ebay. There are ways to make it other shifters work but you would have to use some sort of clamp on the DT either for the shifters or the housing stops.
As for the areo levers I think that would be a nice upgrade.
__________________
“One morning you wake up, the girl is gone, the bikes are gone, all that's left behind is a pair of old tires and a tube of tubular glue, all squeezed out"
Sugar "Kane" Kowalczyk