Currently, my setup looks like this.
T3i w/grip
18-55mm
55-250mm
50mm f1.4
100mm Macro
11-16mm Tokina

I'm thinking of making the jump to full frame and I think the following setup will have most of my bases covered, but not necessarily excelling in one area. Any suggestions otherwise would be greatly appreciated.

5D Mark III w/grip
16-35mm
24-105mm
100-400mm
50mm f/1.4
100mm Macro

The only thing I can see myself doing differently from above is the 17-40mm instead of the 16-35.

Any input would be greatly appreciated.