First, I suggest that you get a bike fitting if you haven't done so already. It's cheaper than a new bike. If you're dead-set on buying another bike, here's what I came up with off the top of my head. I don't know about the 650 wheels, though.
Giant Avail/Defy Advance
Jamis Xenith Endura
I may be wrong, but I'm not sure Trek has a carbon equivalent of the Lexa.