Leave the starter alone, all you have to do is drop the auto tranny out, and put in a manual tranny. That way you can coast start it. Always park on a hill!!
Sorry, hope you find the problem. Had a 1984 Corvette that had the heat soak problem. Drive it somewhere, shut it off , then wait 2 or 3 hours before it would start again.