If you want to invite me back, it would be my pleasure to appear before you again. I gave a presentation on the issue to the ADISQ.
Bill C-32 does not resolve the disparity between the Trademark Act and the Copyright Act. It will not tackle the lack of legal provisions to protect trademarks.
There are provisions in the Criminal Code but they are not tailored to the issue of trademarks. In answer to your question: do it whenever you want but do both, and quickly.