Based on the reviews, a motherboard swap to Intel 13th gen will significantly improve it.

I really hope so too, I bought the same laptop as you a few months ago, and battery life hasn't been great (not to mention it gets hot a lot). I love the laptop otherwise, so I'm hoping the switch to AMD will fix this.