For what it's worth, I would probably choose to upgrade the power train and keep the original engine as a first step. Then upgrade the motor at a later date.