P.S. -- I do not think any of you have actually answered Bond's question. As far as I understood, the question is whether s/he should file as a F-1 or as a H-1B or two forms (one for each). When you are in OPT, you don't pay certain taxes, which you start to pay when you get the H1-B visa. And that complicates the process.