Thanks for all your input. We'll move the queen bed back into the office so I can decorate the nursery. We already have a bassinet we got for DS1. We'll see how we go once bub arrives, assuming all goes well this time.

i was also thinking about getting one of those Ikea day beds. They have 3 sides, so maybe a side rail would work. They can also pull out to be a double bed. I don't know how comfortable they are though.

part of the issue is money. I don't want to pay for something we don't need.