What about the 12-35?

It's a tough one. The 25mm is such a good lens too I'd have a hard time deciding whether to have both that and the 12-35. It seems expensive to keep the 25mm just for lower light situations if the 12-35 is really that good in every other way.