This is probably sacrilege around here, but if I had to replace my 80 in 10 years, I'd probably be looking at a Land Rover LR3 or LR4. LR seems to have gotten past their reliability issues of the early 2000s. They are far more high tech dependent than the 80 series, but so is almost everything else these days. They are still very capable for the sort of off roading I do. They have a genuine off road aftermarket, so there are a large amount of options that you can build on to them. I'd definitely take one over a JK. (I should say that I am not a rock crawler. I'm more of an expo vehicle person, so I have idea whether the discos can be turned into rock crawlers.)
Geof
Geof