I've gone back over this thread to find out what engine you are using, seems similar to mine. The last picture works for me.
Are you able to tell me if the holes for the timing discs in the ABF and diesel cranks are in the same place when compared to each other? I'd like to confirm if the ABF timing disc sits in the same place as it should when changed to the diesel version.
I have a timing disc to put on to a diesel crank in an ABF block, I just have to strip it down first.
Hopefully this will solve your problem. Are you using the new management?