Would contact Dave Easterwood (Dave's Camera Repair) in Chelsea, Michigan. He's a master camera repairman, has worked magic with all my cameras through the years at a very reasonable price, and has 3 storage units full of parts for old cameras. He just refurbished my Rollie 3.5f and a Yashica Mat 124g, and they both work like a charm.
Best of luck!
Ann Arbor, Michigan