Toddler sleep trouble after new baby

I’m looking for any advice to help getting my 3 year old to bed easier at night. I feel like we were spoiled for so long with him having an easy bedtime routine. And now that baby sister is here he wants mom(only) to put him to bed at night and I can’t leave the room without falling asleep first. The problem is the baby is cluster feeding anywhere from 5-8pm and his bedtime is normally 7:30. So I usually have her with me. My husband gets so worked up about the fact that he can’t help and that we just have to ‘sit there’ until he falls asleep. And when he’s upset then the toddler gets upset and then everyone’s a mess!  And after he is finally asleep, at some point he ends up in our bed too. 
Anyone go through something similar, or have ideas as to how to get him to fall asleep with out us?