I would first replace the fuel filter and see if the problem remains. If it does, disconnect the EHA harness and see if the car drives okay. If it does, then the trouble is in the EHA, very likely related to the O2 sensor.

Is the check engine light on? Check the O2 sensor connector underneath the passenger side front floor mat.

Good luck,