You should determine the status of the engine wiring harness before you do anything else. Most likely it has not been changed, given your problems.