X100F EVF issues

[foojix100f]

Hello all.

I have had my x100f for around 5 years and recently it developed some issue with the eye sensor and EVF.

The first issue is the responsiveness to the eye sensor. I often shoot in a way where I focus and meter using the evf but then pull away and use the LCD to frame the image. The issue is the eye sensor sometimes doesn't detect I have pulled away for a few seconds and sometimes not at all. The only way for it to detect is to put my finger over the eye sensor and remove it. or point the sensor towards a direct light source (eg the sun). There is a very light scratch on the top of the two little square sensors but I would be surprised if this is causing the issue.

The second issue I just noticed today that there is a tiny droplet/stain on image in the EVF . It's not visible in the OVF, nor the LCD or final images so it's not a huge deal, but it is ugly and a little distracting. Am I correct in thinking that perhaps some water/dust got into the EVF?

Is it possible to remove the EVF housing and clean it to resolve either or both of these issues. Should I send it to fuji? any ideas what this may cost. I am based in Paris, France.

Thanks for any help.