If it's in that bad of shape, go ahead and repot. Yes, I'd repot in your preferred bark medium for sure. You're correct, Catts don't like sitting in a soggy mix.
__________________ Caveat: Everything suggested is based on my environment and culture. Please adjust accordingly.