Suggest to review H1-B for safety

Sopposing that your PD is October 2006, and even that the cutoff date of June 2011 comes after October 2006, it is not safe to say that you will get your GC before your current EAD expires.

So, why not to renew H1-B? Mostly your employer will handle everything.