I faced the same issue last year. I wanted to go with the easies way as possible. I looked at both options. With a new motor I was worried that every thing would not line-up/fit correctly, and I would end up needing to modify things, were I know my stock engine fits and was just tired but...