Your company attorney is wrong.
Cross-chargeability is applicable to both Adjustment of Status and Counselor Processing.
Please check INA 202 (b)(2) and State Department note "9 FAM 40.1 N8".
On the cover letter of your I-485 filing, the attorney needs to flag cross-chargeability.