The 70-200 II is amazing. The 24-105 is good at what it does, but just isn't in the same category.
On the wider side, have you looked at the 24L II? Yes, the 85 1.2 is also pretty stunning, but if you're also picking up a 70-200, you've already got that focal range covered (without the extreme buttery DOF of the 85, but it's covered). 70-200 II and 24L II is one of my favorite combos.
For reference, I also have the 16-35L, 35L, 85LII, 100L, 24-105L, 50 1.4 - they're all great - but if I had to pick just two to cover "everything", I'd take the 70-200 II and the 24L II. But that's just me