Got home from my neices wedding reception awhile ago and perhaps over imbibed a small amount so my concentration is lacking to some extent. If you are reading 58 degrees after top dead centre then your pump is off by eight teeth on the pump spline. Each injection pump spline tooth is ten degrees on the crank.
Now if you are reading fifty eight degrees before top dead centre at the termination of the drip you are three teeth off on the spline of the injection pump. I am pretty sure you can figure out the rest.
Sorry but it sounds like you have to pull and reset the pump in my opinion. I will let others that have not been sampling spirits give clearer instructions or assistance this evening. Make sure you are satisfied on how you did the drip test. This should not become really frustrating to straighten out. Remember much better than having an unknown problem lurking. The real beauty is after you clean this up establishing pump timing in the future will be like rolling off a log.
In fact it already sounds like you are getting the addiction to these cars. You know how it goes. You get one fix and feel good. Then several more make you feel even better. Before you realise it you are getting almost constant fixes.

These cars will cater to your addiction well.

I have four 123 diesels to service my addiction when I can find the time. Most members in fact have more than one to make sure their needs are met.