Consider obstacle avoidance to be a gimmick that won't actually do anything except detect very large objects and cause the drone to be stopped by the sun. It doesn't detect branches well, and relying on it to avoid obstacles is going to end up with a dead drone.
I have quite a good opinion regarding obstacle avoidance, and the fact that the drone can level itself after hitting something is a very good point, I know this is also luck,
but please don't state "obstacle avoidance to be a gimmick that won't actually do anything except.." .. it's really a
working feature, that worked every time in my case (I know it will happen to hit something, especially when flying sideways, but I count on the fact that the drone is quite sturdy and "crash proof"). The problem is Active Track, is not good enough to follow a subject if the background is not clean enough. A person walking is ok, but a bicycle is almost always too much for active track to follow (there are excepsions, where it can track very well if the landscape is clean)
You can buy
Mavic Pro 2 and Mavic Zoom, those are the real upgrades from your Mavic Pro 1, mavic air is just smaller, and it has more sensors, but also the battery is smaller, I get safely only about 11 minutes of follow me flying with
MA, but again, MP is to big to get it with my when riding my dirt bike, the most important for me was it's size. If you also look into having a better image quality you should definitely consider the new Mavics Pro or Zoom.
Here is the video with my experience so far, using automatic follow modes, mostly using Autopilot app by Hangar (iOS only)