I'm not very happy letting him draw to 6 outs. Reraising a wide range oop and cbetting every flop is just ridiculous. Because of my image I'm sure he isn't going to mess around with overcards if I raise, but if I just call he might fire another barrel on the turn or the river and then I have to give up.

But as you both said, better to just fold pre and avoid these marginal spots.