Part code my dear sir. visual similarities don't cut it. You need the exact part codes, once each and everything in the system is from a corresponding part number, along with the proper wiring connections, only then can you achieve proper mileage.
What most of the road side mechanics don't understand is, this isn't the same old mechanical systems as it was in the 70s,80s and 90s where jugaar worked, computerized is alot more complicated, they have till now only learnt to make it run enough to puzzle the owner, pakwheels is filled with owners having the same complaints and ending up selling.
Mismatched injectors or fuel pump can also be an issue, check the fuel trims while driving on your daily route, that way you can start to pinpoint the issue