Remembr, its the nadir which guides increases, not the pre-shots!
And it sounds like you have a workable plan for handling the "stuff" issues. My housemate isn't my partner, just a friend, and is as much of a pack rat as I am. Most of his stuff is in storage after losing his house 2 years ago. I had a spare room and wasn't going to leave him and his cat homeless, so I let him move in. As he was moving, the Heat Waifs - a mom cat with 4 kittens - showed up. In that neighborhood, folks use cats for dog bait and worse, so they came too. We managed to get 1 adopted out.