Based on my understanding, once you used AP, your H1B status will be lost. So you should either apply EAD, or renew H1B. If I were you I would choose renew H1B.