I've never used A2 or WKM, but with Naza M you can set failsafe to either RTH and land, or simply land in place using the Assistant software. Maybe you can do that with the other DJI controllers too?
Digging up an old thread here. Hexwing - did you notice any difference in noise from your upgraded system? I'd love to stop my Phantom 2 sounding like a flying weed-whacker....