I have both the LCD and OLED switch and I agree with both points. The OLED is only worth the jump if you play it in portable mode on a regular basis.
LCD/OLED or no, I'm still buying this at launch, I don't care. I bought the original Switch at launch and I do not regret it one bit.