Yeah, same for me, I also get the S after I had the CV1 over 2 years and it is not in all point an upgrade, but overall the much better sweetspot, the much lower SDE and the much lower godrays are much more important than the downsides. The bad thing on LCD is also a win because of the RGB Subpixel Matrix instead of the Pentile one from the OLED, thats why the different in SDE is that big between CV1 and S, much more than you would aspect when you only compare the resolutions.
And i think also Rift S is more cofortable to wear.
But on point is very important to know about the Rift S: There is no Hardware IPD adjustment and Software alone is not replacement for it at all. The optimal IPD for the Rift is 63mm, if you are only +- 2mm away from it there should be no problem at all, but I already hear from people that had problems with it with a IPD of 66mm.