I wouldn't give up my 7D except for a 7D Mark II with better specs based on my current usage. For you though I agree with everyone else the 6D is you option.
I bought my 7D for its AF, speed and reach (crop). In this way it complements the 5DMkII nicely but the 7D is blown away on image quality by the 5DMkII. It'll take a good 7DII to replace the 7D.
Not sure what the future will bring for me, but I do enjoy having the use of two bodies. In that sense, the 7D may actually be replaced by a full fram body in due time, if I can get over the loss of the crop factor in combination with tele-lenses.