Yea its best in my opinion to fix the motor u got so u can get used to the cars motor layout and check for damaged or broke parts... I had that decision 4 years ago and i choose the swap and iam still finding stuff that missing or dameged....And make sure u have another set of wheels just to be on the safe side cuz this car will leave u pissed off sometimes...:3d_frown: