Those sound like good plans. I have a 2004 that uses a belt-drive fan and a timing belt. (You have a chain.) When I replaced the timing belt, I also replaced the water pump since it mounts
behind the t-belt! (I'm not a fanboy of some of the design features on this rig, but it's a good rig aside from those.) A year ago I abandoned the fan and clutch assembly in favor of a pair of electric fans. So glad I did, too!
I believe that yours has a fan and clutch as well. It's just a thought, but something you might consider "while you're in there". I did mine after just one trip on the 4x4 trails and seeing some poor dude roast his new J**p after his electric fan died while swamping through deep mud and/or water. After removing the assembly, my buddy was inspecting the plastic fan and noticed that there were half a dozen cracks almost all the way through, just waiting for an inopportune time to grenade everything. That wasn't why I modified it, but I sure was happy to have done it before it failed!
If you don't mod it, at least check it for cracks and go from there.
When you start doing them, consider also starting your own "build" thread where you can update it as you go. There's also the thread below that a bunch of us have posted to, with over 10,ooo posts!
Replaced both heater hoses, and did so WITHOUT BREAKING the heater core's nipples! (Ordering a mixed drink at my next sit-down dinner!) Added a brace and padding using old heater and radiator hoses to prevent that thermo valve from vibrating and possibly coming loose, then wired the temperature...
www.clubxterra.org