I think I'm just going to go full rebuild. When I'm in the jeep, I really depend on it. Not trying to half-ass this
That’s the best thing to do. Putting it back together without replacing anything would be akin to a trail fix to get you home. In your case the “trail is 1000 miles long.