Well, I have a YJ, so I'm biased towards YJ's. I prefer the square headlights.
Whatever you do, DON'T get one with a 2.5L if you plan on lifting it AT ALL. Also, you should know that the 2.5L is not more fuel efficient than the 4.0L, they will both net you roughly the same mileage. The pro is that the 2.5L is said to be more reliable, which is why I bought a YJ with a 2.5L.