i would go by your later date.
you have gone into labour before so i doubt you will have a problem this time, by going by your later date you are less likely to have interventions..