Can't get turn signal bulbs in or out?

I took the one signal assembly apart tonight that had the broken wires on it. I now see the spring. I had a universal 1157 socket that was similar to this one but it didn't have the notch on the side of the contact button to keep it locked in place and it had the springs under each contact. So I've got the whole assembly and the original contact spring soaking in rust-oleum rust remover overnight. Then I will smooth the edge of the original contact button down and get the rust and dirt off it. Then I will take the two new contact wires from my new universal socket and splice them back into the assembled original assembly. I don't see why it shouldn't work then as long as the original spring is good again. So I didn't have to try to remove the non-removable socket in the original housing. That's what I wanted to avoid. It also seems an 1157 will not fit it has to be 1034 bulb.