I would go with David's suggestion first to be honest. I would also look at the condition of the shift lever too. If it's worn get a new one. To really make it better, do the 968 upgrade (detailed on the PCGB FAQ) which will also take out the wear that will be in the shift arm eyelet (by changing the lever, you'll only be taking out one source of wear (the lever) hence it will change better than before but not quite as good as it could.
However before you do this, how sloppy is your gearshift at the moment? People have commented that a new lever makes it much easier to get into gear.
I'd avoid Mr Clutch TBH. I know with 306s the clutches still turn out to be heavyish even after a new one (a half decent specialist normally makes them as light as new (or at least they do in my experience)).
EMC changed my engine for one I aquired plus they put in a fresh clutch (they got that) for not much more than some of your quotes are

.