If it is the app, just use litchi or FPV camera to fly your drone. Both have GREAT flight planning. When I am unable to sleep, I will grab my phone and plan flights for the next day laying in bed.
As for the batteries, ever since Apple done that with their lighting cords, I have been against them, large companies, saying you have to use their accessories to use their product. If they are gonna do that, they need to state that very boldly on the product. I know a few rookies that ordered non dji batteries when they ordered their drones. And I also understand not risking your drone for 20 dollars in savings. But we all, sometimes, rush and don't do the research before we act. Me, heck, I watched every how-to video I could find for about 2 weeks before I ever took my old P2 vision+ up.