So despite my excitement, I've changed my mind and am keeping the 7. I realised I am trying to replace a car that I consider nearly perfect in every way, most people haven't been in a G11, but those who have will know how good they are.
I think I'll have to stick to things like the 7 Series, S Class, etc, and perhaps look at something more sporty as a second car one day in the future.