Zealot Prime

Okay, so I have a 95 civic with a JDM F23A swap. I've been having problems with it stalling. After replacing pretty much everything that could be causing the problem, I took it to a shop to have it diagnosed, they told me I need to replace the ECU and the wiring harness. The car currently has a chipped Civic ECU and the wiring harness has been modified for the motor. (given the overall quality of the work on the car, I'm not surprised the wiring might be faulty)

So: my questions are: Am I right in believing that my motor is pretty much the same thing as a USDM F23A1? If so, does that mean I need the ECU and harness from a 6th gen accord? Should things mostly just plug and play at that point? Also, could I just plug the Accord ECU into the current harness and have it work if the ECU was the problem?