You are being very forward thinking in what you are doing. I think the best thing you can do is be debt free ie. credit cards etc before having a baby. Also buying things as you see them while they are on special is good especially big ticket items like prams, cots and car seats. Budgeting for no income and having the savings account is also a great idea.

Remember you will get loads of gifts especially if you have a baby shower - I got a gift voucher for my modern cloth nappies which was the best present so it's good to have an idea for things like that if people ask what you want/need.