I really only use my 16-35 between 16-19mm... essentially, it is soley used as an ultrawide. For most anything else wide, I'll use my 24L.
Beyond that, it goes to the 35L which is just the perfect walkaround, default lens.
As for distortion, I don't really find that to be a big problem with the 24 or 35. The 16-35 does have distortion (but then it should @16mm on a FF) but it's not very bad and is what I expect. That said, the only thing I don't like about the 16-35 is that the corners are soft when wide open. Because of this, I'll often stop down to ƒ4 where it goes away.
The 24L has pretty bad vignetting wide open (again, as it should really) so I'll often stop down to about ƒ1.8-ƒ2 where it goes away.