Sounds like you're going in the right direction, Chris

Doesn't sound like there's anything about to fail, so I wouldn't be too concerned about using it generally - maybe not for an overland to Morocco just yet.
As Jon mentioned, it might be worth having a quick look at the wheel bearings - this is a much simpler job than playing with the CVs and trunnions. Getting the hub cover and cone washers off will have them loosened ready for when you do the main overhaul.

You will be be checking and setting the WB pre-load occasionally so getting started now is good practice, plus you want to be sure that a WB is not about to let go. Even from a standing start, 30 mins per side should be all it takes.
As advised, you'll need a 54mm socket asap if you haven't already got one. You can get a 54mm box spanner but a socket is better IMHO because you can torque it - box spanner or SST needs modification to accept a torque wrench. While you're buying sockets, might be an idea to get yourself a cheapo 24mm hex socket and grind off the chamfered lip in preparation for opening diff, t/case and gearbox fillers and drain-plugs - as you'll see, the plugs are very shallow and are prone to having their corners rounded off. Snap-ring pliers are a must unless you have some magic abilities to get them on & off easily with screwdrivers etc. Some of the circlips are quite beefy and take some shifting.
In planning your parts shopping list for the front axle, add some of the little wiper seal bolts. They're exposed to salt and muck all the time and they're quite puny so vulnerable to snapping.
Oh and use Toy OEM stuff rather than Milners for the front axle/hubs!
I have a list of parts & part no's that I bought & used on my front axle rebuild that I can mail over to you if you want it!
Cheers,