I can see that being tough when you have had the space as all yours for such a period of time.
I think you really have to have a good sit down with him and tell him he has to start putting in more effort because you are having a hard time with it. Either that or you will have to find something that can make you comfortable with his habits or somethings gonna give.
