Do you observe the linkage on the injection pump advancing to the stop? Have someone step on the pedal for you to observe. Too typical an issue to ignore the possibility. Although I would have thought your mechanic should have caught it.