I'd say wait until the baby arrives. DD slept in a bassinet right up against my side of the bed for 6 months and then we moved her to her cot. We tried the same thing with DS - nope, he had other plans moving him to his cot in his own room saw a huge improvement in his sleeping. I came to a compromise of sleeping in the spare room next door so I am literally 5 steps away from his cot because I hated being away from him - and yes, 10 months later, DH and I have still not gone back to our own bedroom

If I had my time again, I'd probably get one of those Arms Reach co-sleepers in the hope he'd be more comfortable in that, he really hated the bassinet.

The other option if space is a problem might be a hammock, I don't think they take up as much room and you can hire them.