Sounds like a good plan. An additional fast prime could be a nice option as well, as long as the 24-70 II is not available yet the 50 1.2L should be a good choice and will always be.
I know there are a few guys that just have primes. The only reason I'm able to go this route right now is because I'm selling some other gear. The 85 1.2 is supposed to be pretty sweet also.