Just a thought, you might try having some new pins machined to the right spar hole dia. It might save a lot of work.