If you say the engine is not great and you want to spend extra on trying to cure it, would not the best solution be to get a brand new one or a NIB off ebay?? Just a thought.