Managed to get some work in on kit over the weekend.
Finally cut the headstock, and then sanded down to the line. First pic is a progress shot as I scraped and sanded down to the line, and the second is of the jig I made in my studio so I could keep my scraping angle straight. I don't seem to have a photo of the headstock finished, so will take one later.
Then, once the headstock was done, lots of sanding! Pretty sure I've taken off all the glue and machining scratches, but will look again in a day or two when I have fresh eyes.