You have been flying for quite a while. A good Ham friend in the Houston area has several Phantoms, likes them of course. He has a good local dealer who takes care of any problems. Don't know if he has the Mavic yet.
I want the H520, but I ain't gonna be an early adapter, like you I made that mistake with the TH RS model in July, cost me an extra $400.
I have a Note 4, which will work with a Mavic. I may spring for one (Mavic) by and by, after a bit more maturity. The portability and distance appeal to me, less so the camera. I really like my H's, both for fun and for great videos (a local buzzard seems to be in love with them too, often shows up when I fly one).
Thanks for the info.