most people here predict your PD with EB3 would have a chance toward the end of 2016 fiscal year. Maybe you can consider whether you need to renew your H1b in Sept or Oct 2016 which gives you close to 6 months before expiration to consider and hopefully you will have a better idea of when you will get the GC (or might already have it by then). I think the safest thing to do is having H1B extended before receiving GC especially your company will pay for it. Having a H1b concurrent with AOS is the safest just in case you change employer and there is the probability of AOS being rejected due to not having enough similarity between the old and new job. If you plan to stay with your current employer till receiving the GC, then you probably don't need to extend and your company will be glad you save them few grand. :)