Thanks Deejay,
Haven't got the right tools at the moment, but plan to get sorted before the next sharpening is needed. Happy to pay a bit extra to make sure it's right, and that I don't damage anything.
I'll decide on easiest approach to the front roller once I've talked to my f.i.l about new shaft and bushes.
Should have it back and mowing next week.