Now got my car back in the workshop with paint finally cut back and polished. Highly delighted with the end result. New headlining is ready to be picked up from the trimmers. Once I get that in, then it's on with the glass and finishing off the electrics.
Although there's still a load of work to do, finally feel like I'm getting somewhere.