I have owned and loved both. I feel you would be happy with either and either would fit your list of needs.
I would buy either XJ or WJ with the 4.0L engine. It is one of the most reliable and easy to fix engines ever built. It is also darn near bullet proof. The WJ that I had, had the 4.7 V8...