You could also avoid full back on the throttle as it seems that full back for > 1 second (and OSD.sWaveHeight > 0.0) is required to trigger ForcedLanding. And, you can un-trigger ForcedLanding by full forward on the throttle.
It's just me but I don't want to disable the downward sensor. I've begun to trust the auto land feature. I always hand catch the P3 because I'm afraid of a tip over. But, the Mavic has a lower center of gravity and I'm not so concerned about a tip over. Hand catching has it's advantages but the props are awfully close to my hand with the Mavic.