Yes, you do. I also heard some cases that J1 Chinese-Canadian got their H1 without a waiver. So if you can, get a waiver, if not, try apply H1 directly. It may works.