I think Lance's hand were tied once Alberto went off the plan in Andorra. Breaking his collar bone also killed his preparation. I can't wait for next year though. He proved when he went across those gaps that he had the climbing legs but was stuck guarding the other GC contenders.
I am pretty sure Lance wouldn't have started a team without knowing he had Johan. If Vinokourov comes back Astana will probably not be invited to the tour next year, just like last year, so just about everyone will be gone that has any aspirations of winning the tour.
Conventional wisdom is that Alberto will be on a Spanish team and the only one around now that can afford his is Caisse d'Epargne. There is also the new British cycling team starting next year and rumor has it they will have a huge budget. If Cavendish ends up on that team I doubt they will have any real GC contenders since the team will have to use so much energy working on the sprint stages.
I think next year will be a very interesting cycling season.