The thing he said about how when you are irritated, he just wants to irritate you more -- I don't see how you can fix that by just being less picky. That's something that comes from him.

If you do feel like you are being too picky, then I would address that separately, not dependent on expectations of a certain outcome from him.