6D is out soon. Another FF and a cheaper body you can consider to change to.
If you can take the weight of 7D, FF camera and the bigger lenses will be ok for you.