From a professional point of view... I think you have made a very wise decision, especially because of your DD's nature and because you have a new baby due at the same time.
I think it's always better to be that little bit older and be able to manage socially and emotionally and get a positive start to formal schooling. I think you are giving your DD a huge advantage :-)
If your still feeling unsure, perhaps talk to the school.