Yes you sound like you are ready and on the right path. The only other advice I can give you, is for you. After you have the baby, sometime between 1 - 6 months you are very prone for postpartum depression. Newmamma can probably give you more updated info. It is something my wife went thru and although everyone told us about it prior, in the birthing classes, it did still catch us by surprise. Your WH is gone you understand that, so be the best MOM you can be. Take care of Yourself because you have to be healthy to give that baby all that she needs.
Yes I am waiting for a birth announcement here on DB!