Wedding photog looking for a new L

I'm torn as to what to get. My current wedding kit is as follows.

5D MKII
40D

16-35mm f2.8
17-55mm f2.8 EF-S
50mm f1.8
85mm f1.8
70-200mm f2.8

A majority of my "keepers" are coming from the 85mm f1.8, but I feel the photos are too tight sometimes. So... Do I go 35mm f1.4, or 24-70mm f2.8?

Both purchases would lead me to sell the 17-55mm f2.8. I love the lens, but I find myself reaching for the 5D MKII a lot more. IQ is just a step above. Most likely, I will also pick up the 50mm f1.4, but the real decision is the versitilty of the 24-70mm or the IQ/DOF/low-light of the 35mm for a wedding photog.