I would go with a standard Mk5 GTI, or possibly an ED30.
Not as desirable as the R32, but still a great car nonetheless, and similar to what you already had.
I would have said S3, but I hate the older ones - look ugly IMO. I only like the new shape S3's.