Engine for a 2001 XJ

Have 01 XJ with a good body, but needs engine, has low oil pressure due to a cracked cylinder head.

Want to avoid 2000 and 2001 engines because of the 0331 head.

Will a 4.0 engine from a later year 2002 and newer Wrangler, Grand Cherokee be a direct replacement?

Will an 1999 or older engine with a after market cylinder head with coil pack bosses be a reasonable way to go.

Thanks, Dale.