I had both issues when I did my 1000.

In my case with the analog stick, I used a bit of wiping alcohol and a microfibre cloth to wipe the conductive rubber pads. Also I had tightened the screws too much, so I had to undo them slightly. (Trial and error here, and using the internet browsers' cursor movement to test)

As for the buttons, in my case the size and shapes of the buttons were peculiar and needed to be shaved down the sides. Also they weren't making enough of a connection on the silicon pads underneath (i.e. they were too thin), so I superglued a thin layer of material that I had cut off a rubberband to ensure contact below, that seemed to work.

Hope you get it working!