So long as the baby has a roof over its head, some food in it's tummy, and a mommy and daddy who love him/her--you're 90% of the way there. The world is not going to conform itself it you right now or any time for that matter. Thus, I think the best thing you can do right now is keep telling S how excited you are to be having this baby and letting him know that you think he'll be a great father.
To repeat, S will NEVER be as pre-occupied with you regarding the baby's needs. That doesn't mean he loves the baby or you any less, but men are not mothers and it is just not the same. I also can assure you that any advantage of living together a few months before the baby arrives will be a distant memory within days of the baby's arrival. Chill. The real difficulty I see ahead is that I sense S may never match your expectations of what is expected of him as a father---let alone a husband if you don't adjust. And S needs to learn that your anxiety is normal for most mothers and is going to last a lifetime. Be well and take good pre-natal care.
