Hi Kirsten,
I had 7D for 3 mounth I didn't like a lot noise and file to big to manage, I don't know what 7DII will be, I can only read about but never tested.
What I did was to buy a second hand 1DIV, an excelent camera fast with a good AF at high speed, I had with that 3 good shot on 10, 1DIV is APSH and I found it very good when bought a 1DX full frame, many of the things where already in my knowledge and I needed to learn the enhancement and get in use with full frame.
Your choice is right about lenses, you will never change.
Ciao
Max