Vita 1000 right joystick

The right stick on my vita 1000 will just auto rotate when I try to play games that require it. I pulled the console apart and the contact looks dirty on the back of the stick module. The copper spot on the button board, where the contact would touch, also looks scratched away. I can see lots of green through it.

Would it be better to try a new board first or a new stick in order to make this repair? ALL the other buttons on the board are looking and working just fine, the stick alone has an issue with the auto drifts and spinning.

I tried ordering a stick but it was mistakenly for the 2000 slim and with that one installed the problem persists but it rotates in the opposite direction. I'm being more cautious before ordering more parts now. Advice appreciated.