I would check the crank sensor wiring. You will need to remove the crank pulley and lower timing cover to do this. Given that you’re going that far you might consider just replacing the timing belt and water pump. I’ve seen the sensor wiring damaged during a timing belt replacement causing similar issues.
I’ve also seen loose timing belts caused a similar issue.
Good hunting and please keep us posted.