Welcome Alan, from the South Island of a locked down New Zealand.
I'm a great fan of the H520. Sadly, I'm not so impressed with Yuneec's services, though I have a good relationship with a Shenzhen based supplier for both my DJI and Yuneec needs.
Apart from the many tips I'm sure you've already...