Hi Deejay,
Already ordered the new parts as suggested.
Since the parts are getting harder to come buy, I ordered another captive cotter pin so that I have a spare clutch housing.
But I took your advice and ordered a new thrust bearing also.
Can't wait to get the clutch sorted.
I'll post some pics etc as soon as i get time to work on it.