Don't worry you still have time to apply for H1-B.  I don't know how the rules are now, but I remember hearing that even with your H1-B receipt(EAC) you can start working. I guess you can double check this with USCIS. My first choice would be to apply using H1-B premium processing.