Problem with drift in both sticks. Need help with diagnosis!

Hi!, I am trying to fix a dualshock 4 that has drift issues in both sticks. First, I tried to solve it cleaning them with no success, then I replace the inner rings of the potentiometers, same result, the issue persists. So, now I am going to do some soldering work. The point is, I do not know If only replace the whole 4 potentiometers or if I need to replace the whole joystick. I mean, how can I know if the drift issue comes from broken potentiometers or if the problem is the stick mechanism?. Apparently the stick is physically well centered in neutral position, the drift is noticeable only in certain games, like infamous second son. Others, like horizon zero dawn or days gone have not a so fine control and the game does not present any drift issue. I guess that the joystick dead zone in these games is bigger.

anyway, thanks in advance!

Edit: adding gamepad tester images

timestamp value is creasing constantly, some values of the axis are trembling. max value of axis 2 is 0,97, it does not reach value 1.