Congrats on your BFP

I'd go with the EDD 2nd Sept as the calculator says.

My cycle was 3 days short when I got my BFP and all my scans have confirmed the date I got from the calculator.