After I read the information from the weblink you sent, I believe I fall within the exceptions, and I was relieved.
-I think you might misunderstand what you read from the links. Obviously, the information in the link emphasizes that if your I-485 is pending, you have to use AP for the international travel, and only one exception is that you can use H1/H4 or L1/L2 visa to enter U.S. if your status is H/L and thus, your I-485 is considered valid without using AP. Otherwise, your I-485 will be considered abandoned/invalid.
So, you need to re-file a new I-485 after you enter U.S. when your PD is current.