I would just take the money that your going to spend on the swap and put it into the existing motor. I think you would be much happier this way you can keep the torque and plus the extra power. The b18c is a good choice also but will spend a pretty penny on this motor.