I've rebuilt an ej22t and it was by far the hardest engine i've ever built. Def get a longblock and swap it out.