"Ethics" would indicates one should do the return correctly, despite the fact the returns have been wrong in the past.  And 'red flag/audit risk" isn't some that should dictate the correct preparation.

Have you read up on Form 3115, and how to handle the situation ?