Great suggestions for the UWA. Thanks to everyone that contributed. In terms of a general walk around lens (assuming I rent these and have good experiences) would it be unreasonable to go with a 24-70ii instead of a 17-55?
I don't get the hate other have on the 16-35II. When I had a 7D, it was my most used lens.
But, on a 1.6x body, the 16-35 isn't an UWA. It is 25-56.
You need either the Tokina 11-16 or Canon 10-22 for the UWA department. I liked the Tokina, and to some extent, it will work on a FF camera.
The good EF-S lenses have been optimized for the cameras that use them. The 17-55 is an excellent lens and gives a 38-88mm FF equivalent. The 60mm macro will give you a FF 96mm equivalent, and it is very sharp.
Not having a specific timetable for the "FF upgrade" means maybe you shouldn't buy lenses with that in mind, unless they also work on the 1.6x for your uses.
When it comes time to make the FF move, just sell the EF-S stuff and look at it as a rental for the tools that were proper for the job at the time.