Sounds like you've got it licked there, good deal. By looking at the picture it would appear you're getting out there and enjoying your Jeep. If I can offer a little advice based on the photo, when you get back from deep water crossings etc be sure to grease everything to push out the water trapped in the u-joints etc., plus check your trans, transfer case, and diff oils for level and water contamination. Oil seals are primarily designed to keep oil in, but not so much for keeping fluids out, it's time well spent and cheap insurance.
If it wasn't done the hard way, I didn't do it.