Lesson learned on removing the spigot... I didn't realize that there was loctite on the threads until I stipped the lower one.. The other two were fine.
I did notice that the pipe had three small gouges in it where it was wedged against the 8mm spigot bolts and vibrating. They could use some extra room in there.
Button heads are a great idea but at this point, I am not touching it unless the spigot falls off.
I do have to say that out of all the bikes I have owned, this one seems the most finicky regarding the "little things", like gas cap leakage, front fender brace, small bolts, odds and ends stuff that could be a bit sturdier.
But I wouldn't trade the bike for anything!
