Nintendo Switch: is it worth buying a new one?

Ex
- in Nintendo
1

My problem is that the battery of my switch runs out quickly and the switch heats up quickly. That annoys me. My switch is really not that good anymore. So I asked if it was worth buying a new one or waiting for a new Nintendo Switch to appear? For information, I have the "1st switch", which means that it does not have the improved battery. One of them came out with an improved battery. I don't have it, so I have the "first" one.

So is it worth buying the Nintendo Switch with the improved battery or should I wait a little longer?

Ju

I would at least wait for E3 in June, because if it is announced in the near future, it will probably be there.