In that case, it's better for you to turn OA off then. You'll get faster speed, better battery efficiency for more total distance, and none of the sun stopping RTH problem.
For me, OA is more of an annoyance than a feature. Fly with it on even against a moderate headwind, and your Mavic will crawl at less than 30kph when you'll still do over 40kph with it off. I was (and still am actually) also annoyed that I have to tap the "OA is off warning" away before each flight, but it's becoming part of my pre-flight check list now.