Hi Rich
Have you check the cable running to the starter motor are not too cooked, i.e gone brittle?
I had a similar issue with my 21 and changed the cable running to the starter motor and sheath it with heat resistant stuff.
Did the relay trick as well and no issue since about 5 years ago
Jack
Emily, The Very Yellow 21