Don't waste money on a new camera and gimbal, you may still be getting bad results. Just send it to DJI and they will send you a new/refurbished drone for the cost of their repair. You can't beat that.
By the way, when I bought my first DJI drone, it was the Mavic Pro and after about 2 weeks the camera went crazy, for no apparent reason. I flew it and landed it, perfectly. Changed the battery and went to take off again and suddenly the camera was going crazy on startup, jiggling all over the place.
It was a week before I was heading to Europe, so I had to have our local official DJI sales and repair place, replace the whole assembly because it would take DJI 2-3 weeks before they could get mine back to me under warranty. That hurt my finances, but I had no other choice, if I wanted to take the drone with me on holiday.
From stories I've heard, the gimbal is the one thing that seems to be the hardest to get right, after damage, when doing your own repairs.