Your Trek probably has 32 mm on it, with treads, so not good rolling tires for asphalt. Changing to 25 or 28 mm slicks might net you a 0.5-1.0 mph more on pavement. You want something similar to the Crossrip--to be able to ride different types of surfaces, but much lighter and stiffer. That's sort of what I'm hearing.

What is your budget?

Edit: Just saw your budget.

For $3k, there are a ton of options. Make a list of features you want on the bike--frame material and geometry, component level, type of braking, and max tire width, and take it to you LBS and see what they have that fits the bill. I'd want the bike to fit at least 28 mm tires if I'm riding anything other than smooth asphalt, btw.