I would much rather see them stick with the lcd display, even if visuals are slightly sacrificed, or find another supplier.
maybe I have luck. My Note 4 fully beautiful and working, almost six years of use. Only buy a great amount of the batteries.
Maybe a new tech OLED screen is the problem?