The Lostboy

So I've checked the solenoid by linking the terminals with a crocodile clip and this causes the starter to turn in the same way that the ignition does. So am I right in thinking that means the solenoid is ok as I get the same result from using the igntion as I do from bypassing the solenoid?

If so then my next job is to remove and check over the starter motor. Anyone know where I can get a starter motor rebuild kit apart from in the UK? The seals look pretty perished so reusing them won't be an option.

Thanks