If you plan on keeping it for 20 more years, then go with the best option to be honest. The only thing with that option is that its probably more then what the KJ is worth, but again, if you plan on keeping it, then I wouldn't worry about the engine swap being more then what the KJ is worth...