Trying to get more time with the XJ

Hey guys so recently my water pump failed and I decided to drop a little bit of money into the XJ, just trying to extend its life a bit; right now just working on a list of things I should look into and so far the list is really just gaskets, a new timing chain, and the replacement pump. I'm also trying to drop the old fluids and replace. I was wondering is there was anything else I should be trying to replace while I'm in there? Just to give you an idea of what I'm actually capable of, my most recent projects were replacing the oil pan, u joints in the axle, and a wheel hub.

Any advice would be greatly appreciated, I'm not really experiencing any specific problems, the engine just feels a bit tired and trying to do the jeep right.

Thanks!

Trying to get more time with the XJ