J-1 212(e) — Advisory Opinion says not subject but had home government funding

I’m trying to determine whether I need to apply for a J-1 waiver before filing I-485. My situation:

•	I initially entered the U.S. as a J-1 visiting student with funding from my home country government specifically for U.S. research/training.

•	I submitted the financial support letter during my visa application.

•	My first J-1 visa stamp was annotated “subject to 212(e),” but my DS-2019 did not indicate that I was subject.

•	I remained in the U.S. for about one year, then returned home briefly (SEVIS and DS-2019 remained active).

•	I later obtained a new J-1 visa for a postdoc at the same institution. The second visa and DS-2019 do not indicate that I am subject to 212(e).

•	I requested and received a Department of State Advisory Opinion stating that I am not subject to the two-year home residency requirement and do not require a waiver.

Given that I had home government funding for U.S. training and my first visa said “subject,” but I now have a favorable Advisory Opinion, should I rely on the Advisory Opinion and file I-485 without a waiver? Or is it safer to apply for a waiver first? Has anyone had USCIS question a favorable Advisory Opinion in a similar scenario?