Starter heat soak ????

Having the EXACT same problem! Your issues are spot on with mine. Changing the timing didn't help. I have the original GIANT starter wedged inside my header and was seriously thinking of replacing it with a mini. Please let me know if you figure it out.