Sounds like the vacuum shutoff on the injection pump may have issues working properly. When the mechanic changed the switch there is a vacuum control device on the rear of it.

The mechanic may have impacted this in some way so keep an open mind. If the fault started right away after the switch was changed my money might be on that area. If not an issue right away may just be coincidence.