I was about to post a reply like this but then I saw this and this is the best advice so far. :k:
Ajuba since you are noticing a whole in the fence therefore you will have to start mending the fence. Do not expect that he will realize his mistakes and one fine morning everything will be honky dory. Take some practical steps along the line PCG posted above.
And this is the gem CM takes the cake. It is very practical and very easy to implement. But do remember it is from a guy who is not even engaged yet.