I'm definitely going for the 5D3; that's if I can sell my 7D, lens and accessories.
Don't sell the 7D. Save up longer and keep two bodies. That way, you'll have a backup body if one needs repair. You'll also get to take advantage of the 7D's 8fps burst if shooting fast action and the 1.6x crop factor if you need more reach out of your lenses.