Lens Lineup help

I am shooting currently with a 7D and 1DsII. I use the 7D a lot for video since it is 95% of my business. I have gotten so addicted to it, i might trade the 1dsII for a 5DII and give it another go. I am just confused about my lens line up for both stills and video work. After shooting with fast primes in low light this weekend, and getting amazing results, I want some help on optimizing my kit:

24-70L
70-200f2.8IS MKI
85f1.8
50f1.4
35f2
Sigma 15-30f3.5-4.5

I have been thinking about dumping the 35f2 for a Sigma 30f1.4, however, I can't use that lens on a FF body. I do want a UWA zoom for fast prime WA as well. I used every lens in my bag this past weekend, really favoring the 50f1.4.

A 24L would pair your 50mm very well and it's a lowlight WA prime. It'll fit the 5D2 you wan't to buy.

You could sell your 35/2 and 15-30mm for it.

yeah, dump one of my regular video cameras and two cheapo lenses for a 24L, and trade the 1Ds2 for another 5DII despite it's crappy AF. I tend to take the 7D with me for all my photo needs and not carry the 1ds around due to it's weight.