Time to upgrade the old 5D ???

Been thinking seriously about upgrading the old 5D to a newer full frame. Since I have a 70D, I like the similar layout and controls of the 6D as well as the pricing. I do like the 5D III for all the obvious reasons except the obvious, price. Just can't seem to make up my mind and for no good reason. I'm also thinking that if I wait, hopefully the new 6D will have a better focusing system. I do pretty much all types of photography from sports, macro, landscape, event and night shooting.

Thoughts and suggestions are appreciated in advance.

If you can wait, I think I would... either the 5D3 will drop in price some more (maybe find a lightly used body?) or the 6d will get that af upgrade or both.

Maybe find a used 6D? they are 850-1000 now on ebay. You have the 70D for sports and such..

I'm chomping at the bit for a 5D3, but I'm holding off too as the 5D2 is doing the job I need it to for now, and I want the next camera paid off, or mostly, at the very least.