Yes, get a Clubsport!
It’ll be a hell of a lot of money to upgrade so why not look into an R or something so it does actually feel like an upgrade?
Or keep it and wait for the mk8?
There are as many different opinions on the subject as there are members in here.
A test drive or two would be a good start. Then take an R out...