Looking at your image the white plastic post is missing between the zero position (long contact) and the secondary contact (long contact). Rectifying this first may help sort some of the problems.
Rather than bending the contacts a bridge can also be soldered across the zero position contacts.
