I would definitely repot with a free draining gritty mix. This way you will be able to examine the roots and Caudex for any abnormalities (rot, etc.) and know what they are potted up into.
The leaves would most likely fall off anyway.
It would be a good start.
Rick
