our international office told me that the safe way is use AP, also get EAD ready before use AP. If you keep same employer, even your I-485 denied, you can still keep your H1 valid (assume you still have valid H1 while you use AP & EAD).
So get EAD now, it take me less than 3 weeks.