I'm with you..... I don't want to alter my actual wages paid (which ties to W3) in addition would then have to override QBI wages (or should it?). I don't know, everyone seems to be content with how it's reporting.  

Your proposed work around is the only thing that works even when it seems wrong. The objective is then accomplished.  M-1, line 2 and 5 wipe each other out which is fine because the taxable income is correct. 

Thank you!