Becoming more aero, and faster

Whatever a fitter says is best for you after seeing you. I don’t think anyone could properly answer that on line. Someone in the The Bike Fitting Mega-Thread - Equipment - TrainerRoad thread however, might give you a steer but I wouldn’t guarantee it.