Yes, but is that the responsibility of the party engaging in CD? "An unjust law is no law at all." I believe that, eventually, a corrupt state will either fall to Criminal Disobedience or bend to the will of Civil Disobedience. An outbreak of Criminal Disobedience can be initiated without the presence of the Civil form. A separate group aiming for the same cause shouldn't be regarded as the same group overall. The two have an obvious distinction.
But I see what you are saying, that, although Criminal Disobedience can occur independently, it also follows dependently with CD. I just don't think that it is the Civil Resister's responsibility. Without the unjust law to begin with, neither of the parties would occur.
Edit: Found a quote that fits perfectly with this, wish I would have put all of this in my paper.
"Actually, we who engage in nonviolent direct action are not the creators of tension. We merely bring to the surface the hidden tension that is already alive." -MLKJr