We used a 4.0 head on a 4.2L block, and re-used the 4.2's intake manifold, along with a Cherokee exhaust manifold, so yes This was a while ago.. I do remember doing some slight mods to the bolts that hold everything down, but it was nothing huge...
Brent - his profile says he has an older YJ. Maybe he just scored a 4.0?