There are solutions that lead to fun over hate, but you know that. Mine is factory fresh with .400, and my iphone 6+ is great with it, but I bought a iPad Mini4 (refurbed from Apple) just for the Mavic. Yeah, it's a bit of money, but I couldn't be happier. The bigger screen is easier for my 63 year old eyes too!
As a computer geek and lousy programmer, I totally get the problems DJI has with the plethora of Android offerings out there. Apple has tight control on their product from inception to delivery, so it is consistent and therefor easy for developers to code for. Android is like a bunch of cats that refuse to be herded, sure they're all cats but none of them fully agree with the others. What a nightmare for DJI to attempt to do!
That doesn't help you, but considering rolling back and an iOS device might put you in the sweet spot so many are in, then you can enjoy your investment rather than hate it.
Just a thought....