Upgrade Options

I do landscape,street,portrait,BIF,candid,family,etc... with a 7D,grip,17/40,70/200,100/400, 50f1,4,TC 1,4, TC 2,580EX. And generally print A3+.......So, what is my best upgrading option ? Forget the financial aspect :

A- Keep my 7D and buy a 6D.

B- Sell my 7D and buy a 5D3. (all in One).

Thank you in advance for your skilled advise.

--
Lecelte