I would also not rule out the electric fuel pump that feeds the injection pump. Easy to fix and easy to overlook.