Is it the original motor in the car and not a conversion? Ive had same problem and turned out i needed an extra earth cable on battery. When engine was hot would not start for buggery, same symptoms as heat soak on the starter. Something else for you to check if it turns out its not the starter