It is better to use OPT, since you have only 6 years H1-B. Thus you may save some time for your H1-B.