oil filter help

I can not find an oil filter to fit my 4.0. The engine came out of a 1990 xj but it appears to be a different year block. It has the horizontal style mount. The filter that a 90 calls for (ph-3985) does not screw on properly. So I grabbed a ph-16 and it screwed on fine but the seals don't seam to line up and it leaks. Can anyone help. Thanks

http://madxj.com/MADXJ/technical/technicalfiles/ARoilFilterConversion/OilFilterConversion.htm

that describes the only two possible variants of the adapter you can have.