Hi Guys,
I am an ex member of the click club . I did all the solutions with some brief respite, including changing the solenoid. Eventually I bit the bullet and purchased a Brise starter motor. What a difference
No click, relay removed, FIA switch back in circuit, replacement solenoid sold and I have a spare battery.
Not sure how you assess the condition of the starter motor but I wish I had before started on the click journey.
Hope this helps
Ian