I highly recommend the 7D. I recently upgraded to a 5Dm3, and had originally intended on selling the 7D to finance the upgrade. But once I got my hands on the 5Dm3, I realized I would miss my 7D too much to sell it.Was in exact same boat. I recently posted my 7D on CL to help finance a 5D3. Ad has been deleted and I'm keeping my 7D and adding a 5D3.
1) 8fps is great for sports and action photography. Unless you want to shell out another $5,000 for a 1DX, you won't beat the fps the 7D offers.
2) Solid AF. It's *only* 19 points, but AF is still very quick, and I can move between the 7D and 5Dm3 and still feel like I'm not losing much when I'm on the 7D.
3) It's simply the best crop body out there. If Canon does refresh the 7D line (there's speculation they may not even introduce a mark ii, though I think they will), it won't be anytime soon. And as it's been pointed out that given Canon's pricing strategy, it will likely be a big price jump.
And honestly, my wish list for the new 7D isn't even that much... It's still a great camera.
Get a 7D now, prices are very good. You might want to even wait for the holidays, maybe there will be a rebate on bodies and maybe the 6D will push prices down a bit.