Aero bikes still don't have me 100% convinced. Although not marketed as an aero bike, I think Focus has the right idea with their D shaped tubing on the Izalco Team.
I didn't like Treks before... but now they look more like bicycle versions of Volvo's than actual bicycles to me.