Aside from something better than the 100-400 I'm pretty much done, too (sadly?). Canditates are a new 100-400 or slightly possible, a 300mm f/2.8.
I've condensed my line up to this:
Samyang 14mm f/2.8 IF ED UMC Aspherical
Sigma 20mm F1.8 DG Aspherical RF
Sigma 35mm F1.4 DG HSM | A
Sigma 50mm F1.4 EX DG HSM
Tamron SP AF 90mm F/2.8 Di MACRO 1:1
Canon EF 35mm f/2.0
Canon EF 50mm f/1.8 Mk I
Canon EF 17-40mm f/4L USM
Canon EF 24-105mm f/4L IS USM
Canon EF 70-200mm f/2.8L IS II USM
Canon EF 100-400mm f/4.5-5.6L IS USM
Canon Extender EF 1.4x II (great with the 70-200mm f/2.8L IS II)
Lightweight zoom / 7D 'kit':
Tamron SP AF 17-50mm F/2,8 XR Di II LD Aspherical [IF]
Tamron SP AF 70-300mm F/4-5.6 Di VC USD
Sony NEX-6 'kit':
Sony E PZ 16-50mm F3.5-5.6 OSS
Sigma 30mm F2.8 EX DN
Sony E 55-210mm F4.5-6.3 OSS
Wait, are these the lenses you currently own or a wish list? That's a lot of glass!
Errrhh.. yes I actually own these
And it took me a while to get there too, I think at max I owned about 21 lenses for digital use. I have a few FL and FD lenses too, sitting around with a couple analog canon FD/FL bodies.
5D3, 5D2, Sony α6000 | SY14 f/2.8, Ʃ20 f/1.8, 24 f/2.8, 35 f/2, Ʃ35 f/1.4A, 50 f/1.8 I, Ʃ50 f/1.4 EX, 100L Macro, 17-40L, 24-105L, 70-200 f/2.8L IS II, 1.4x II, 70-300L, 100-400L | E-mount: SY12 f/2, Ʃ19 & 30 f/2.8 EX DN, 16-70 ZA OSS, 55-210 OSS, Metabones SB | FT-QL, AE-1P | FD(n) & FL lenses.