Sinec you have flickering i would say there is a loose connection on that circuit. You need to take out all of the devices from the each box and check the connections. I bet you that one of the connections is burnt or almost there.
Loose connection.
It is good that you have replaced the ZINSCO, but for future i would not start out by replacing the panel.
