Well, I got until March 2019 to fix my shit, wish me luck, especially that I won't see an IJ until January 2018. Hoping for an administrative closure followed by a quick I-601A since I can't do AP anymore.
Really wish I didn't get caught on the border, I'd do AP already and just file for adjustment. Hell, I'd be one of the first ones out of the country.