It's a shame your thinking of selling such a beautiful machine and so well cared. I think you can consider getting a 6R or making a 4WD conversion. Not sure what would be best for the money.
If you prefer getting a 7R or a RS3, make sure it has all the gadgets you like from factory, the new generation isn't easy to retrofit most of the mods we can easily do in the mk5 and mk6.
Your Ed. 30 is one of the best inspirations to the rest in the forum.