I had a similar experience with my S2 clunking when accerating or when changing down a gear and all signs pointed to the rubber center on the clutch, however when it was removed to be replaced, it had already been done and when I dug through old invoices found out it was done less than 10K miles previously.
The mechanic while doing the job noticed the rear transmission linkage had not been installed correctly when the clutch had been replaced before and there was a lot of wear on the joints, we decided this was the likely cause of the clunking on gear change, such that the car was not engaging the gear properly until under load when it would fully engage but cause the clunk as it did so.
I could have just replaced the linkage for £120 but thought as the clutch was now out I might as well replace it as we both thought there was some fault with it possibly weak spring or incorrectly (poorly) fitted based on the quality of the work on the linkage.
So well worth checking the other transmission parts before jumping to replace the clutch, also check any old history or invoices to see if the clutch has already been replaced as if within a few years it will probably be a spring type clutch rather than rubber centered one anyway.
For interest I had mine done in February and the clutch was £450 from FrazerPart Porsche (Sachs) the rear linkage was £120 I had the catalytic convertor welded for £25 and the mechanic charged me £300 (£900 all in) and the actual clutch replacement took around 6-7 hours.