Great read Peter, thanks for your fascinating posts and project. 35 hours doesn’t seem long at all to me for labor. I would go about the work in the same way, cleaning while it’s apart and taking my time to do it right. TBH I probably would have taken longer than you to do what you did.