I would definitely get a 14-24 f/2.8 if I switched, so I think you're doing the right thing there.

I've never shot with a 24 f/1.4, but I really like 35 f/1.4. I think you'll be pleased. Tough luck about the 135, but what can one do. Personally, I love shooting people at 85mm.

I'm jealous!