help with starter clutch parts diagnostics

Hello!I removed my starter clutch a while back. Bike is a Z1000J -82 that had the metal to metal screaming noise when starting.I also have some wierd noises from the bottom end while cruising, goes away on deacc or acceleration, so I was hoping it was the loose allen bolts on the starter clutch I have read about, but these have been changed and it was well torqued togheter.

but..

The springs is only 34 mm (I read somewhere they should be 38 mm when new)the case looks worn inside and the surface on the clutch gear looks worn as well (pictures attached).So my question is how much I need to replace:
1: only the springs and cylinders (because short springs is the culprit)
2: springs, cylinders and the case itself?
3: as 2 but also the gearWhat do you think?
Thank you/Jonas 

Replace it all. That gear is shot. 

Hi,

Thanks for input with the pictures. Very useful to see how it should look like!

I ordered a gear right away, found a new one to reasonable price on ebay.

Another question: when assembling it later on, which parts should be greased? only the starter pin/gear? anything else?

/Jonas

Assemble using assembly lube just to stop any metal to metal contact until the engine oil does its work. 

Don't forget the steps in service manual that pertain to the chamfered washer direction. And that the rubber damper produces the correct drag on the starter clutch gear.