Thanks for the update Ramjet and also thanks Logger for the input. One of the first things I considered, as I've had this issue before with older quad builds, however, taking it to the park and testing it didn't fix the issue.
Anyway long story short, DJI organised to pick it up and it went to...