Sounds like you are doing quite well at this point in time. As I said I am open to suggestions but that was my general game plan for the moment. I would say I am a good 3-4 months from adopting a Yorkie so I'm sure mine isn't born just yet!
By the way, I wish I had a kitchen where I cold fit 2 people width-wise
he he he