Yesterday I went to our local shop to get some advice regarding my 60D and some minor scratches (barely visible) in viewfinder. I was bit concerned since I plan to sell it soon and these marks are lowering the resale value. The technician said it's not a reason to replace viewfinder and noted if I haven't informed him, he would not know about it. So I was quite happy with result.
But, why I am telling you this story? This whole trip ended up the "worst" way it could (in my situation) and now I am owner of shiny new 70-200L II, smiling satisfied and my wallet is being 2K lighter (ok, I'll get 250 back due to canon cashback).
It's my first white and today I completed my dream set of 5D mk III + 24-70 mk II + 70-200 mk II + 100L
Thank you all guys for all advices, useful links and opinions.