Lots of interesting comments and suggestions, glad to see others are also plagued with similar decisions. A change is always good for a different perspective as well I think. If it wasn't for my wife (and young family) I'd probably continue to just fill up my closet, but having that to keep me in check has added the element of carefully thinking out my purchases and trade offs between different kits. fortunately, lenses chosen carefully do hold their value well with Canon.
I liked the idea of 17-55, 70-200/2.8, 100-400II, 1.4X. That's a great range, and close to the same net value (based on used prices of my primes), but I would miss using the f/1.2 to f/2 range. Portraits by candle light and by the campfire are a nice change of pace that often have a memory attached instead of just a pretty face.
I'm away from home, but the plan is coming together. Just need to get back and package up the 7D + 10-22 (still working on the buyer to take the 24-105 as it's cash and saves the listing). The 17-55 and 135L are in the mail, and I've decided to keep the primes I have for now and skip the 85mm and see if I'm happy with the coverage.
7DII (to order yet), 17-55/2.8, 35L, 50L, 135L, 70-200/2.8 IS II + 2xIII pending reviews of the 100-400II
Assuming the new 100-400 is all we hope it to be and the swap occurs with the f/2.8, I may some day have to choose between the 35L and 50L, and trade one for the 70-200/4 IS. I'll be that one guy in the world to have made that trade between the 70-200's