to use AP might better for you. Or you keep H1, if you use EAD, apply H1 visa outside USA and return to activate your H1 status (return).