But my company lawyer firmly say it is OK. I emphsize my concern to him clearly. And whatever he said is very reasonable and logic.
Basically, he says I am NOT subject (restricted) to H1B quota anymore. So I can easily switch to H1B. Since I already used a quota in 2001.