Yes, you have to wait.
However, at the same time, even though you decide to change your NOC, I don't know how you will deal with the fact that you have already provided your reference letters from your employer(s).
It is possible to change NOC if you chose the wrong by mistake. For instance...