Sounds like the white and black wires are backwards going to junction box originally. If you are POSITIVE it is a three way switch (I don't think it is) I would try swapping your wire number 2 and the white wire on the switch. Hopefully your CB works if that is not the issue. If all is metal conduit that is you ground. Does the white wire connection at switch tie into the frame of the switch? If so That is not a 3-way.