Just wondering if I can use an old Square D QO HACR breaker in that new panel??

Two receptacles in our living room are connected to the chandelier of our living room. So the receptacles do not work unless we turn on the lights. I have checked that the main from lower level comes to the switch and from switch the wire goes to a junction box. This junction box connects the light as well as the receptacles My goal is to connect the receptacles directly to the main. Theoretically, I can cut the main, disconnect the wire from junction to receptacles, connect the two parts of main and the wire to receptacles in a new junction box. But if I cut the main to switch , there is not enough wire to connect the two pieces of main and wire to receptacles. I am thinking I will probably need to install two junction boxes and use a short wire to extend the main ? Any other easier solution ? I am attaching a diagram that will show what is the current connection and what I am trying to do