I would go by the scan date. Annoying I know, especially as it has put you back but it does all depend on when you ovulated and conception date not just when your AF was due.
I am a late ovulater and my scans always put me back a week from my LMP date.