For what it is worth, I would be insisting on a brand new engine that is not tampered with at all. Even if this means they need to change the computer, etc, etc. This way you are ensured of a brand new engine, factory warranty and the best chance that you will solve your problems.
I have never...