A 4.0 swap would be your best bet.
The 2.9 is forever linked to its infamous cracked heads and blown head gaskets, not worth the hassle and expense.