To be honest, i would say get the 70-200, then if you can afford to upgrade later you just need the 20D body and all of your lenses will still fit ! If you go to Switzerland with a 20D and your current lenses, you will still feel short a lens without the bigger zoom !
My 2p worth anyway !
