I would put the queen back in the office and worry about it when but is old enough to see how they are sleeping and what they need. I wouldn't personally go straight from bassinet to bed if bub is sleeping solo.

DD2 is a shocker of a sleeper. She mixes it up every night. She'll wake and cry for a feed and want to stay with me. So we go to sleep in my bed. Then she'll wake and cry because she doesn't want to be in my bed anymore, she wants the cot. And then the bed, and the cot, and so on (and yes, it took me ages to work this out!). So we have the cot right beside our bed to try and minimise the amount I have to move around during the night and wake myself up further. Musical beds to the extreme here :-/