you're best to put the same engine back in, otherwise you will be having computer / sensor issues. i'm going through a similar problem right now with a d16y8 that was swapped and the wrong intake used. it wont rev past 5000 rpm, among other problems.