I think I may have been wrong to assume timing was mechanically correct. I borrowed the correct tools and checked to find it was out by a tooth or maybe 2.

Although it still doesn't run correct and haven't checked for returning codes I am happy the timing is now corrected.

attached are the new waveforms but I cannot be certain they are known good yet.