I'm almost sure, without reading the build thread, that you could swap the wiring harness and intake manifold from the old motor on to the new without much difficulty, and still have a new motor. If I understand, they are the same motor, just the throttle and related wiring would be different for the drive by wire. Please correct me if i'm wrong.