You can change to F-1 without J1 waiver. I did this many years ago. But when you tyr to apply H-1B or green card, you have to waiver of J1