I think you should go to your country on May and como back on October with your H1b.
I'm in the same situation, but i haven't applyed to the waiver yet. how long did it take to you to get your waiver?,
Once you get your waiver Could you still working with your current J1 visa, because mine...