The issue here is ineligibility to invoke 245k. You need to have (let's limit to only subclause A here) no more than 180 days of "unlawful STATUS" since last admission (thus excluding AP entry) or other parole (not AP, but other paroles, there are several type of immigration paroles) So AOS only with no valid non-immigrant status is not a legal "STATUS" but only a legal "PRESENCE", so you will not be able to file EB I-485 again unless you re-enter with a non-immigrant visa to reset the clock.
I said this is not a new interpretation because this language of "STATUS" in 245k (A) and it's difference with legal stay/presence has been discussed between USCIS and AILA a couple of years ago already.