Second check would be Heat Soak of the crank position sensor..fairly common.
Do not over-look the OVP , specially if it still has the OLD part#.
It can cause your problem.