I crashed my Air 2 for exactly the same reason - battery separation. Swollen batteries don't get good connections. The inherent design so that the batteries fall out when loose is a flaw. The Pro 3 has a better design.
Too bad. I did enjoy my Air 2, but do appreciate the better cameras from the newer drones.
I have come to realize that drones are not good long term investments.
No they aren't at all long-term investments at all. Consumer grade at best