Repair the Japanese edition instead of my old Hong Kong v?

I have used a Yashica Electro 35 GSN, a Hong Kong version with no pad problem, since it was purchased in 1980. It does expose film with great uniformity from one frame to the next (except in the dark), but there are so many other things wrong with it. I generally used the hyperfocus method with ASA 1000 film and made no large prints, so I never noticed until 2013 that the lens is way out of register with the distance scale and rangefinder - the 20 foot mark indicates focus at infinity. The viewfinder is not tinted, the frame marker is tilted and the rangerfinder spot is faint. I broke and reglued the rewind knob, the frame counter window was swallowed by the camera so that it periodically jammed the advance for a while, the light seals need work, and the frame counter reset tab sticks.

So, in honor of the thousands of pictures taken with this camera, I bought a replacement. This camera was made in Japan; it is heavier and has a tinted viewfinder with bright markings. I put a single piece of black cotton yarn in for a light shield, and tested the focus and shutter speeds, before shooting a roll of Fujifilm 200 film. This showed that the camera takes sharp pictures, but it also confirms that the shutter is five times too fast, and is sometimes much faster. There is also a frame counter which is reluctant to count.

So I am thinking that I may continue this project by sending in this Japanese edition for refurbishing and leather. I have other cameras, but only a Canon EOS 650 comes close to serving to the subjective function of the Yashica GSN rangefinder.