Finally worker out the correct date with my ob today. He worked it out based on LMP and taking into account my longer cycle. It's within one day of the edd given at my first scan. Happy to now have an edd!