Call his bluff!!! Sounds like he is definitely trying to stir things up, so just agree with him!!! You don't have to mean it of course or change your ways but just keep agreeing with everything he says!!! This really winds my fella up! Maybe if you give him a taste of his own medicine he will back off a bit!
Just say "of course, you're right" , "whatever you say" and "I know I'm weird but you should be used to it by now!"LOL!!