I'll take the minority view and recommend the 60D. I own a T2i and a 7D, and I wish I had bought a 60d instead of the 7D. What's that, you say? Well, I use my cameras more for video than stills, and with Magic Lantern, even the T2i leaves the 7D in the dust in the video realm.
Other points to consider:
- When I load my 7D up with a largish lens like the 17-55mm IS, a 580EX flash, Zacuto viewfinder and tripod quick release, it's HEAVY. Granted, you probably won't burden yours to the same extent, but weight is definitely something to consider, if as you say, you intend to use it for day-long excursions.
- The newer Canons (T2i, 60D and later) have higher resolution LCDs than the 7D. It's noticeable.
- The 7D optical viewfinder is larger (by a couple percent) and brighter than the 60D. One point for the 7D.
- I have small hands, and the legendary back button focus is awkward for me - I have to crook my thumb at an odd angle to reach the AF ON button. Definitely try the two cameras out for hand placement before you buy.
- when shooting video, I OFTEN wish I had an articulating screen. It's not merely a gimmick, it's genuinely useful.
That said, however, I'm sure you'll be happy with either camera. They're both a major step up from your current kit.