Shouldn't have applied for F1 after H1. The latter is dual intent and once you apply for it you lose the privilege to file F1 or other similar single intent visa.

Best option might be to look for another company to apply H-1B. But if you have to start a new process on H-1B then you have to wait till October to get a job as the quota is over, unless you get a job in an university.