Yeesh. That's a hard choice between the two scenarios. It is very hard to say. Personally, I would make a compromise:
5DII
17-40 f/4L
24-105 f/4L
70-200 f/4L
50mm f/1.4 (Sigma version if you can swing it)
85mm f/1.8
Of course you knew that's what I was going to recommend.... it's practically what I own already! (Only swap the Sigma for the Canon... which I would, if I could, and I will sometime, depending on whether Canon gets a new 50/1.4 out soon, as is rumored.)
Rationale: A) I don't think you'd be happy with just the one prime, and a telephoto at that. A 50mm prime is much more versatile. The 35mm/85mm combo would be better than the 50mm/85mm, but you're looking at a lot more money for the 35 than for the 50.
B) I don't think you'd be happy without a normal zoom. The 24-105 is just... nice. 24mm is wide enough that I don't often feel the need to swap to the 17-40. 105 is decently long... not as long as I'd like it to be, but definitely quite a bit better than 70mm.
C) You'd be giving up the 16-35 for the 17-40, thereby saving $700... which is more than enough to buy the 50/1.4! A little more and you could also buy the 28/1.8 which would give you a nice trio of fast primes in wide, normal and tele.