I started newspaper work at a pretty large daily as a freelancer a little earlier this year and here's what I would consider recommending:
Consider selling the 5d2 for a 1D Mark III (might save a few $$ on your end) or maybe get a 1D Mark II/N. I just recently upgraded to a 1D3 (I'm still expanding my gear bag, but its getting pretty good) and absolutely love it. I have a 1D2N (selling it though) which was great except I didn't go above ISO 1250 on it. 1250 was pretty manageable but at 1600 it got pretty bad. 1600 on the 1d2n is pretty similar to 6400 on the 1D3 (from my short experience so far).
I'd sell the 17-40mm for the 24-70mm - the extra stop of light and bokeh will most likely come in in handy. But if you still want ultrawide (comes in hand for getting a cool perspective in a lot of situations) check out the Sigma 15-30mm f3.5-4.5 - it only runs about $300.
Likewise for the 70-200mm 2.8. Maybe to save $ though, you could get an offbrand version. I've heard good things about the Sigma copy.
I'd also consider getting a cheaper second body (i.e. 5dc or even 40/50D) too. 2 Bodies is pretty standard and will definitely help a lot.
Just for an idea of the future, my kit currently is made up of:
1D3, 50D (planning on selling this soon and getting a 5d2 or the rumored FF body)
24-70mm f2.8, 70-200mm f2.8, 50mm 1.4 and Sigma 15-30mm, and a few speedlites (corporate headshots and so on, plus I do weddings).
Planning on getting a 300 2.8 soon enough, and selling the 15-30 for a 16-35 at some point to. A wide prime would be nice too. Thinking about Sigma's 24mm 1.8.
