Headliner repair Cal35 1981 era

Hello all: The headliner on Harmony is coming apart in a few places. It looks like the fabric has popped out of the plastic track. The track has cracked in some places. Other places the thin plywood backer strip has come unglued from the inside of the cabin top. I'm considering adding teak battens over the seams and screwing it down. Or striping it all out and sanding, filling, painting. What can be done? Any suggestions? Dan Dunmire Harmony Cal35 Stony Brook, NY