I'd go by the later date too. Particularly if you know that's when you O'ed - that's pretty conclusive IMO. And like Lulu said, it's frustrating going post-EDD (even though it is totally normal) so I'd take the later date so your less likely to go as far over IYKWIM?