When I had the 600 fw, my Mavic was extremely solid and experienced zero drifting. It had gimbal horizon issues (unresolved by calibration etc).
When I downgraded to the 550 fw, the gimbal issues went away, but it started drifting instead. Which fw are you on?