The new Guild looks great!
... need to figure out what to do about the bottom strap pin
I use those Dunlop straplocks on my stuff, and at one point bought a bunch of buttons en-masse (Allparts sells just the buttons - so you don't have to buy the whole Dunlop kit every time) to retrofit to my basses. My JS-II was a bit of a pain because of that strap pin in the body:
Just wrap a cloth around the button, grab it with some pliers, and carefully and gently twist it side to side - should wiggle right out of there. It leaves a huge hole behind, so what I did was get a wood dowel from the hardware store, sand it to fit (the hole had sort of a conical shape to it - so I tried to match that and snug it up), and then used a bit of wood glue to glue the dowel in there. Once that dried, I drilled it out for the Dunlop button (just a normal size wood screw) and once installed, the button and little felt washer that I use actually covered it all up. It was kind of a pain to deal with, but it has held up well.