4.0 crate help

Is there any good companies that make a 4.0 or stroker crate? do have the time to rebuild or the patience :flamemad: looking at a guys 2000 xj dirt cheap but motor is starting to fail. Or any easy easy weekend rebuild kit? I was looking at titan but sounds like a nightmare co.
Thanks

Willy51 on here does good performance rebuilds. Check with him about if he is willing to ship.