I still think repair bay is an option, they had drones there and they are phone responsive. I am looking at a 520E as a replacement, I have the E90X and E20TVX thermal cameras and the 520E can handle them.
Take a look at the Anzu Raptor, a remake of the Mavic 3 series but made outside of China...