Yes. need J waiver before you can sub-mit 485.

However, DOS review board can determine if you are subjected to 2-yr residence rule. Contact DOS to get their official judegement. CBP or immigration officer sometimes makes mistakes.