I thought this was Shahid's workshop?? Were you at Aslam Lahooti's workshop? The workmanship looks like his.
You are right: only a few individuals can accurately nail the details. Dawood Ustad was one of them. He rebuilt our CJ7 back in 2000. He passed away in 2002 and his son Aslam is now running the workshop. Dawood was the probably the best, as his restored specimens are on display at museums in the US and elsewhere.