Fiddled some more with the hinge pin retainers, and installed the left ones with cleco.
Cut return spring socket with hole saw and a bit of slotted tubing and mocked up and trial installed parts. All seems good, so primed parts and fitted ply bits to tubes with urethane glue.