WWYD: spring cleaning in gear

Spring cleaning in my lens bag(s) and closet.

A lot of my lenses are quite situational and every few years I struggle with having too many lenses. I wanna take another attempt of creating a kit that fits most if not all of my needs.

Currently I have the following gear:
5Dc + 40D
Canon 17-40L
Canon 24-105L
Canon 28mm f/1.8
Canon 50mm f/1.8
Canon 85mm f/1.8
Canon 100mm f/2.8 macro
Sigma 50mm f/2.8 macro
Tamron 70-300mm VC

Regarding the bodies; my 5Dc is getting outdated (feature-wise) and since I've been shooting FF, I don't really like to shoot crop anymore.
So I've decided to try and sell both and get a 5DII without putting too much money in it. Preferably a store 5DII that's still got a warranty though, but details on this aren't very important.

I'm not too happy with the primes I have now, and I find that I rarely use the 100mm for anything other than macro because the 85mm is better at portraits.
That seems kind of a waste and I've considered various options for a prime-kit. 35-85-135 has always made sense, but the 100mm macro always butts in between.
One of the reasons I've always loved lenses like the 28mm, 50mm and 85mm 1.8 was that they're very light and compact. However, I've bought an Olympus E-PL5 with 20mm f/1.7 recently, and that fills my compact needs for now (maybe with a 45mm f/1.8 because it's nice).

Since compact is not much of a requirement anymore, the following currently makes sense.

Sell 28mm, 50mm 1.8, 50mm macro, 100mm macro.
Buy 35mm 1.4 (Sigma or Canon), Sigma 150mm OS macro.

That would leave me with 35-85-150 instead of 35-85-135, but I think it'll be a nice combo. The 150mm is also a great macro lens with a good tripod collar and still serve as a long portrait lens. It even takes TC's.
I'm also tempted to sell the 24-105 but I had a few great sessions with it recently, so I'm keeping that for now, same as the 17-40.
Not sure where the 70-300 fits in, but it's nice for zoo trips. Perhaps I'll move the tele end to my olympus though

End setup would become:
5DII
Canon 17-40L
Canon 24-105L
Canon 35mm f/1.4
Canon 85mm f/1.8
Sigma 150mm f/2.8 OS macro
Tamron 70-300mm VC

Any thoughts on this? I may decide to still get a second body or keep a backup, but I might want to get a 5DIII in the next year and "retire" the 5DII as backup. But the amount of paid gigs jobs is limited enough to get by with renting a second body.

I'm also planning to do a whole turnover in my flashes, but that's a whole other story.

Sounds like a plan. I would keep the two L lenses because they will not lose their value and do a good job on FF. I love my 5DII. Wouldn't give it up so I think you'll love the upgrade of that.

Thank you Suzy. I gave it a bit more thought, but I still really like the 3 prime, 3 zoom kit. 35-85-150 + 17 - 300mm in 3 well placed zooms with plenty of overlap.
Offers a lot of versatility, but still leaves some room for a specialty lens like a 24mm TS-E or MP-E 65mm in the long run.

There's only three things I'm not certain about;
- Sigma 35mm vs Canon 35L
- Buying the 5DII new or used. It's about 1650 euros new vs 1100 - 1200 for a good used one. I still hope to offset the used price a bit by getting one with one or two extra batteries.
- Selling my 40D, since it'll only bring up about 200 - 250 euros and it's still in top shape. However, I'd like my main and backup body to share batteries, so maybe an additional 60D (flip screen is awesome for macro) in the long run - when I find a nice deal on one.