I wish I had a better answer for you but my go-to solution as of late has been the pragmatic "I agree. Do you mind if I fix that in a later PR to avoid spending too much time on it?"

If you've built up some trust with your team, they shouldn't have a problem with it.