Front passenger lock sticks

[BCC93QT]

Had the Q out on the road today since it was sunny. Nice n' smooth. Noticed my front passenger lock was sticking. Won't lock unless you hit the lock button a few times. Wont unlock unless you hit it a few times as well. I have a parts car, is it easier to swap it out or is there a quick fix? Also, is it the whole unit/face plat that needs to get changed or can i just use the lock piece itself. Have to take the door off soon anyhow, speaker sounds like SHtT. Also my driver side motor is going out so will probably upgrade both front speakers as well as replace the motor from the other car. Anyone had their locks stick like this before? im sure someone has. Did a few searches and didn't come up with much. Also, my guides or whatever they are on the windows are starting to rust. What is the best method to resurfacing them? use some char boy or paint rust remover? Or maybe even pepsi. Can't remember if it was pepsi or coke that used to remove rust from my BMX bike