Sorry to her you have had this s**t mate.
Agree with GOK and Shayne, Get it back and change mechanic. Pure guesswork, parts changers at work there, with you as the cash cow.
The clue is in, - he THOUGHT the injectors and pump could be the issue, manufacturing work, assuming they were even refurbished as stated.
Now saying egr not functioning ??
Time to pull the plug mate, find someone by recommendation, and/or get a workshop manual to tackle the egr/throttle body cleaning.