He has given you some hints. He'd like you to be "sassier." You should have put your foot down "a long time ago."
Well, better late than never. Figure out exactly what you are willing to put up with, and what NOT. Then tell him very directly what you expect of him.
Do not move out. Don't even think about it. Tell him if he wants to live alone, there's the door. It's your house and you're not going anywhere.
As for who sleeps where, I wouldn't make any moves unless he has done something to justify cutting him off (ie, an affair).
How he responds to this approach will tell you what your next move is. Of course, this all assumes you don't want a divorce.
