Upload & Sell: On
Okay, sell the 70-200. If you don't use it, liquidate it toward other lenses.
5D mark II
Keep the 24-105L -- it is a great all-around lens on FF. You could use the 5D2 and that alone -- that's why it is the kit lens packaged with the 5D2!
I prefer the 16-35L II to the 17-40 -- much wider than you'd think 1mm would be! and sharper on the sides with less vignetting -- and brighter focusing, with f/2.8 when you want it.
If you can live with manual focusing, I'm recommending Samyang every time I turn around -- get their 35/1.4.
If you have to get an 85, again, go with the Samyang 85/1.4, or the EF 85/1.8.
Keep your Tamron 90 macro. At least for the time being.
Finally, you might think about the 50/1.2L as your splurge lens.