Trading up. What to buy ???

I'm impressed by what I've been reading read here. I'd like to tap into the knowledge base for opinions/facts. After riding my Raleigh C-30 for 10 years I want to buy a new bike in the $1000 - $1800 range. I have (Hopefully) narrowed the choice to Trek 7.5 or 7.6 and the new Giant Rapid 0. Giant has Mavic Aksium Race rims/hubs/spokes and Shimano 105 Derailleur. I've been told it has superior components to the Trek/Bontrager combo. I'm 6'2, 210 lbs, 52 Years young but really 25 inside. Riding for fitness and 40 - 75 mi charity rides. GOAL IS TO DO RAGBRAI IN JULY !!! All 475 mi. Thanks !!

__________________
"What a Long Strange Trip It's Been !!! "