AP is ok, EAD is not

The law regarding the use of AP and EAD and their effect on the non-immigrant status has changed recently. You can use AP and still keep your H1 if you don't use 485-based EAD to work and don't switch employers after using AP to come back.

In fact, as H1, you don't need AP at all if you have a valid H1 entry visa.