7d + 35L or 5dmkII + Sigma 50?

If you could choose to shoot with either combo, with bokeh in mind, which would you use? A 7d with the 35L or a 5dmkII with a Sigma 50mm f/1.4?

Reason I ask is I have a chance to buy a sigma and if I do, I'd sell my canon 50 1.4

But then I got to thinking, if I want to shoot at 50mm should I just use my 7d + 35L combo (even though it will be slightly longer)?

have have the 5d2 combo, and the bokeh is AWESOME. highly recommended. buttery/creamy smoooth. but still tack sharp where you have DOF.