I agree, a lawyer consult may be warranted here, but you can naturalize under the 3 yr rule. I do not know how much they probe the VAWA basis for your LPR status, but they will review your complete case history, so they should be aware of it.
Honestly, if your goal is naturalization, I would not wait despite the current political environment.
Good Luck!
https://www.nolo.com/legal-encyclopedia/when-vawa-green-card-holders-can-apply-us-citizenship-naturalization.html