Gear shuffle: which would you do?

I'm thinking about switching my gear around. I haven't been really inspired lately, and I feel like switching things up may get me back into the groove a little bit.

I currently have:
5D2 / 20D
16-35L mk1
24-70L
35L
135L

What I'm looking for/reasoning:

I rarely use the 20D (nothing it does that the 5D2 can't do). I think the 24-70L is a great lens, but I tend not to use it "creatively". It's sort of my "just get the shot" lens. I would like to move away from the "just get the shot" mentality (I'm not a pro) and get more into taking more creative or thoughtful shots. So that said, the 20D and 24-70L are up for sale.

I'm thinking about going to either:

Option 1: More disruptive to my current set up. Leaves me with no zoom, but I'd have a great pair of bodies. More expensive than the second option.
1DIII
5D2
24L
50 f/1.4 (Sigma - and maybe a 50L down the road)
135L

Option 2: Easy switch from my current line up, but no 1DIII. I could use the 16-35 as a "standard" zoom on the 1.3x body.
1DIIn
5D2
16-35L
35L
85 f/1.8
135L

I shoot mostly performing arts, so high ISO performance is important to me (why I have the 5D2). However, I'd like to go focus more on primes and I'd like to have a body w/ pro AF.

Any thoughts? Maybe I'm crazy.

I'd go with the 1DIII. I had the 1DIIn and HATED the rear dial and the way it works with the select button. If only for that, I'd go 1DIII. If you don't know what I'm talking about, give them both a shot, if you can get your hands on both.

IQ quality of primes and having a good pair (mkiii and 5dmkii) would be killer. Especially since you can always carry around 2 cameras to minimize lens changing. The AF of the mkiii would be a good upgrade too

My dream setup is pretty similar.
mkii and 7D
24L
35L
135L
70-200 IS 2.8
15 FE

Chris, I know what you mean about the IIn rear dial. That's probably a good thing to consider.

D_S, it's not so much the IQ, but it's more the speed that I'm after I guess. 1D AF + fast primes is something that I'd really like to try out.

My favorite setup: 1DIII with 35L and 5D with 135L.

I think I'd do option 1.