[JFP in PA]

A couple of things are bothering me here; you noted that at TDC the cams did not all line up correctly, which leads me to believe that the cam allocation is off. Yet your guy claims that the "shutter" disc has also moved (something I have read about but personally have never encountered). As I have not seen one of these with the shutter disc moved, I don't know how you can tell it has moved (it is press fit onto one cam). Perhaps that would be a good question to ask him.

If the car was in my shop, with the problems noted above, I would reallocate the cams in question to set a known baseline, and then clear the code and see if the cam allocations make sense. If they do not, or cannot be read, and the code reappears, then the shutter disc may be your culprit after all, which would require a cam swap as I know of no procedure to reset the shutter disc, other than to replace the cam shaft itself.