u have enough time to apply

personally, I think you should be ok since AP is no longer required for H1 to leave US. You can also try applying for H1 visa in china. Because H1 is dual intent, you can't be rejected for having filed immigration petition.