I believe I have what you are looking for but it needs a CLA on the rangefinder and shutter speeds. It will be priced accordingly.

Will PM you when get home.