It seems that your lawyer knows what they are doing.

It seems like they tried to fit as much as they could with limited space.

You might consider checking "YES" and then including the explanation that you provided here on the last page of the form.

Generally, you have the opportunity to make corrections at the interview.

You can apply after you become a U.S. citizen

You might try an e-request if you believe that there is an error https://egov.uscis.gov/e-request/Intro.do

I agree with the other answers. It is generally better to disclose everything to be on the safe side.

You might try using the Avvo Find a Lawyer service. https://www.avvo.com/search/lawyer_search?utf8=%E2%9C%93&q=immigration&loc=Sacramento%2C+CA

This is a serious matter that I think should be addressed in a consultation with an immigration lawyer.

As my colleagues have stated, both avenues can be tried.