Just do a H1B transfer. So with this, you will have the dual AOS and H1B status. Do not abandon the H1B at any time.