file regular H1 before your J1 expires (without J1 waiver) then the DOS may approve before USCIS sends RFE asking for the waiver letter. Stay in US and wait. Only after receiving DOS approval, file I-907 for H1 premium processing to get H1 approval fast.