Well, I've made my decisions. I have ordered a 6D and a 40/2.8 STM (had to try it, for $129) which are waiting across the border for me to pick up next week. I picked up a nice used 70-200/f4 IS already but it's fairly useless so far without a body.
And I just ordered a Voigtlander Skopar 20/3.5 as my final lens of the kit! Can't wait to give this one a try.
I will wait till the new year to see about possibly something fast in the 50/85 range if it materializes but not in any hurry. Or maybe a ~100 macro, but not both.
In reviewing all the shots I've taking in recent years, how I go about it, what I respond to in lenses, I feel that the Voigtlander holds great potential. I like to have a light/compact kit. The 20/40 combo certainly provides that. I really like the 20mm view on full-frame. I also find that I like the prime lens shooting experience. And I've no qualms about manual focussing at this distance. It appears from most accounts to be at least as good and sometimes better than many equivalent focal length zooms and primes, save for the zeiss which is over three times the price, weight and size. I really liked my Pentax 15/f4 (22.5mm equiv) but always wanted it that extra bit wider. The final bit is that both the 20 and 40 share a 52mm filter size. I'm getting step up rings for my Cokin holder as well as for the 67mm shared by the 70-200. So just one c-pol required.
My Sony RX100 remains my walk around, get whatever kind of shot camera in the 28-100 range. The SLR is for more intentional, creative shooting.
One body, three lenses. Going to give it a good try for as long as I can!