Upload & Sell: Off
For me the 24 goes over the 35 any day. As you say, you can always crop. The 24 offers more challenges at times, while the 35 is easier / safer to use. But I had the 24L / 24L2 for a combined 14 years, and it's been always my favorite lens (back in my 4 lens lineup as well as my current 17 lens lineup). All those 14 years except two (May 01-Dec 02) were of full frame.
I do not own either lens currently. I have been thinking about the same decision, and it's users like Stan and a few other forum members who have me almost convinced to get the 24.
To the OP, I'm not sure if you're using FF or crop permanently, or have your mind set on something, but for me the choice was, I do not own a FF camera any longer. all of my bodies are 1.3 or 1.6. That was the decision for 24 over 35 when I do buy one.