I just replaced the starter solenoid contacts today, 45 minute job. I had issues a year ago with clicking but no engagement. I had taken the solenoid apart and filed the copper contacts and ring for a temporary fix, lasted almost a year. I ordered the repair kit last week from the UK, 'REPAIRKITSUK', thru ebay, and got it done today. There must be loads of current needed as the copper was really pitted. At least this is a good garage repair, rather pay myself then the shop.
Mike