Spent the night grinding with some additional steel plates to make a spindle locator that can be locked into position to stop it falling out of the swing are in the case of a loose spindle bolt. Used M5 bolts into a threaded back plate eventually after some experimentation. Will weld these plates together when I get a chance, maybe even make CNC parts if I can get a scan of them to guide a model eventually.