May I add one more:
4) General purpose all-around walking lens?
35L II whenever it materializes from the ether. Until then... probably the 24-70mm f/2.8L II, or the 35L, heck, I even like the 100L IS as a dark horse (it's crazy versatile on full frame, a joy to shoot with, light weight, and no distortion). Tough choice.