Not only is the 'problem' AAV incorrect, that's a great example of an 'S' trap.

The easiest solution is to cut the trap loose and run the drain over to the AAV line to become the drain and vent and replace the current drain/vent tee with an elbow, thus correcting both problems.