You need waiver regardless, even you did change your J-1 to F-1 in Mexico. I guess it is very difficult to change J-1 to F-1 in Mexico. If you go back to china, before you get F-1, you need to stay in the country for two years. Good luck!