We disabled dither alignment feedback but left the dither for P and Y both, and adjusted the WFS demod phase to minimize the peak for Q. We looked at 380Hz for P and 410Hz for Y.
See attached for the demod phase and whitening setting. This is probably not better than 10deg level.