If you are looking at the 6D, the 35/2 IS could be an option unless you really need f/1.4. The IS is excellent - it's hand-holdable down to ridiculously slow speeds, plus it's sharp, and much smaller and lighter than the 35L. Not to mention less expensive...
Regards,
Scott