Since you swapped out every other thing, I would think a motor swap would not be much more work at this point.