Great stuff! That 2 piece wooden block sure must have started out as 1.
My boat is surrounded by a couple feet of snow and covered by tarp right now. I have only looked at the interior a couple of times but I don't think the bolt or the area where the pin goes is hidden under any glass or plywood. Do you know what year your 21 is?