OP, an OLED upgrade model is probably a long ways away, and by then it could very well be launching at like $650 if the rising price of ram/storage continues which presumably it will.
Lite is definitely the next model to release as getting something cheaper on the market is crucial for Nintendo this gen.
So if you want the system probably makes sense to at least buy the current model before the next price raise.
I've also been conflicted, but not because I want a more expensive OLED model haha. I still have my 2017 Switch and it's great and I still have plenty of years left of Switch backlog. But as a lifelong Nintendo gamer I want the new system, mostly for the next gen of Mario/Zelda and whatever few special surprises come out this gen, but the excessive prices of everything and the lack of games kept me from buying it.
Personally I recently decided I'll buy a Switch2, only because I made five grand in purely extra money the past two months so I decided a thousand of that can be splurged on the excessively priced current gen haha. Though my game intake this gen will be far far lower than it was on Switch. OoT is the first game on the system I'm interested in so I'll probably buy the system when it comes out. That $1000 will be enough to get me the system, travel case, SD card eventually, OoT, Metroid Ravenous, 3D Mario, a year of NSO Expansion Pack (GC games!!), and one more future game, which is probably all I'll buy in the next couple years. It's completely crazy that is all $1k will get me lol.
If an OLED really makes that much difference to you just realize you will be waiting a few years and very likely will be spending like $700 just for the system and one game by then. Honestly I'm not even sure in this market that Nintendo will release an upgrade this gen. Price-wise, the original model is already the super expensive model. Last gen with the original at $300, they had room in the market to put out a pricier system, I don't think that's really the case this gen, in that most people are already stretching to buy the system at it's original $450 or today's $500. Not many people are going to want an even more expensive model of the system, especially as there will almost assuredly be more price rises on the current model.