I guess I got my answer on the electric pickup, this is what someone posted on Trainboard:
"What I also did with mine is a soldered very tiny magnet wires to each copper pickup tab that contacts the metal frame (not interfering with the frame, but inboard of the frame contact points where there is empty space). Those wires go to the halves of each frame contact point. It's not perfect, but it overcomes the problem of those bendy pickups not contacting the frame."