Will nintendo release a switch 2 with better battery life like switch 1?

I'm looking to getting a switch 2 but supposedly the battery life in handheld mode drains quickly. I have a pc handheld and love it, i will 100% play handheld on the switch 2. Oh and I can wait for that better switch 2 but just worried about losing battery. Thoughts? Thanks, fam