F1 works

We have had such cases before in the company that I work for. Go for the F1 option. Virtually no risk here. It's your choice whether you want to complete your studies, but if your goal is green card you're better off switching back to H1-B asap.