Given that, I'd say the 24-70mm f/2.8L is your best bet. The 16-35mm is definitely too wide/short for a walkaround lens on a FF body.