I have the same issues with the doors, however my beeper locks only the boot (Which is fine provided i hand lock the doors before pressing buzzer).
If you do figure out the fix for the C/L I would love to steal some of your knowledge as to what to fix haha. Thanks in adv and good luck with the car. Post some pics up would love to see your progress!~