It is very hard for you to get J1 waiver since you are not Chinese citizens now. I think you can use your TN to work.
You can try H1. USCIS should not approve your H1 application since your J1 is not waivered, but maybe they cannot find it.
Another,check your J1 to see whether it is for Canada or for China. Good luck.