I’m not an experienced person but it’s good to consult with a lawyer after you complete your study and before you apply your wp. You have 180 to submit pgwp application so you have enough time to sort this . But I think you should ne fine as long as you took continuous semester not less than 3 courses each . Better to get a good lawyer at there is always risk to apply yourself.
Okay I’ll be sure to get a lawyer. Thanks again!