Sorry no other advice to offer. Looks like you have gotten a lot of good and experienced ideas.
Good Luck with the little one! I'm sure everything is fine.