Agreed. H1 at this point is a safe bet. 1 yr or 3 yrs is entirely up to you (and your lawyer). Personally, my H1 expires on 11/30/2012. My PD is 8/20/2008. I will most likely be in a similar situation a year from now and i fully intend to apply for H1 followed by EAD/AP.