Went with Jasper, and so far very happy. They replaced water pump, oil pump, all hoses (which cleared my CEL for small vac leak) and one motor mount (knocked that off my to-do list as well). It ran great for a couple days, but then developed a stumble and hard start. Got me right back in and found an injector that (I think) had bad O-ring. Runs so smooth and quiet now, I can't believe it.
Had them look at the clutch while they had the motor out, and they said it looked fine, so THAT'S off my list as well. They did replace the pilot bearing, and the shifting is much easier and smoother.
All in all, can't recommend them enough, especially since the 5-year warranty is nation wide. If I blow it up in 2022 at TJ Fest II, I won't have to tow it home!