Upgrade Time!

I have finally decided it's time for a no-holds barred upgrade for my sad old xs. I'm gonna take the jump to the 7d so I need to get some glass that matches my update.

Right now I have an 17-85 f4 is and a 70-200mm f4L. They both have suited me pretty well so far. But I want to upgrade. I travel a lot and take mostly outdoor landscapes and wildlife shots. Because most of my travel involves hiking I don't want anything too heavy or too many lenses.

I'm willing to spend what it takes to get the best quality. I know I have to upgrade the 17-85 but do I need to upgrade the 70-200? Is there something better out there?

Thanks,

CJ