I'd let the roots get a tad longer and then pot it up. The sooner the roots get used to the medium, the sooner they'll establish themselves. Don't cut the leaves off. The plant is using them for moisture and food now. That's why they are wrinkled. In my experience once they get to that stage they usually stay that way even with new roots. I'd start introducing it gradually back into brighter light. Then you should start seeing new leaf gowth. Good job bringing it back!
