Yeah - I'd go with the later date as well...that's what I'm doing this time around as I think my actual due date is a bit earlier.
At least your more likely to go early or on time if you do that! For me it's all a mental thing! hehe.