could you co-sleep part time? i.e.` bubs goes to sleep initially in the bassinette, but after they first wake up during the night you have them in bed with you? This is what I do occasionally, sometimes DD won't go back to sleep after her night feed, or is taking ages to go back to sleep. When all I want to do is go back to bed I give up trying to get her back to sleep in her cot and pop her in bed with me. DF doesn't like it much, but he's not the one getting up to her all the time!

That way your baby should be used to sleeping on their own for the first part of the night, and you and DH can have some time alone. or you could always explore other areas of the house while bubs is sleeping in your room!

DF does smoke but I'm not overly worried about it, I sleep between him and DD (so I'm in the middle and DD is on the outside) so she isn't close to him if she does come into bed with us.