You cannot wait until April 01, 2008, since your OPT is over in March. I.e., you will be using your OPT until Oct 01, 2007. Then turn to H1-B.