There used to be a 4cy TJ at Dean's, but that was a few months ago.  I am not sure when they switch from High to Low pinion, but it might be worth trying to find a TJ 2.5L D30 w/ high pinion.  I'll keep an eye out up here in the NH/ME area.  I don't have my XJ up here now, but I will in a few weeks.