Use AP!!

Most people don't understand the difference between H1 visa and H1 status. If you apply for H1B out the country, you have H1 visa to enter the country. But most people change to H1 status here, so they have H1 status but no H1 visa. According to USCIS, if you have valid H1 visa, you can use that to enter the country without affecting your pending I-485. Otherwise, it is more wiser and convenient to use AP.