I think it's awesome that you are aware of the need to set good boundaries for his sake as well as your own!