90 VFR750 Starter Clutch Problems

I think my starter clutch needs to be rebuilt, but I am not for sure. The bike will turn over fine at first, but then start clacking and slipping. Seems more prone to doing it when the bike is warmed up, also when I give it throttle during starting it slips more. I've seen kits to replace the springs, barrels, and caps. I have seen scenarios where people need the casing that it all sits in too.

Bike has about 40k on it, I've read that's when the starter clutch starts to go. Does it sound to you guys like that's my problem?