Have you looked at the Typhoon H?To be honest, I haven't decided yet. It's not about the money at this point. Their lousy offer is worthless to me because I can easily get a new P3P on sale with the remote and charger for not a whole lot more. My current Phantom still works fine, I can replace the camera for around $350 and I'm back in business. I've had her out a few times in controlled environments and everything seems fine.
Trust me, I've been researching the competition and DJI still has the most features for the price point. They obviously know that, hence they feel they can treat their customers like crap. It's not even the 20% that bothers me, it's the the lack of communication. I would have expected someone to speak to me and explain their findings, explain how they arrived at 20% and at least pretend to give a **** about keeping me as a DJI customer. I've heard nothing !
The Solo by 3DR is available now for $599 with the gimbal.