I'm with ya. I want to like the OLED, but I had to return my launch day X last year. I tried again a few months later hoping the screen would somehow be different, but it got returned as well.
I ordered a Max. Hoping the rumors of a new screen supplier are true, and that that will somehow be better.
I'm sure you will, but please keep us posted. Right now I plan to wait for the Xr but there are a few weeks in between so those that give it a try can let us know.