First of all, WELCOME!!
If it were me, I would replace your front hubs with the Premium WARN.
It has been a while since I have been into the front end of a CJ, but I would pull the hubs, repack the wheel bearings and replace the wore out-lock outs with some WARN Lock outs. Just my .02 To me...