I admire you use of verts @cooly . I don’t think you need to get that lo and you can always instance or duplicate-link a Rivet/Bolt after making 1.
Just some thoughts. I think the baking works better on these things if they stick out of the geometry if there is actual geometry to back to.
Otherwise this is a good blockout!