Overall I agree with you - BUT one or two days buffer is not much buffer at all. For most people I'd suggest a couple of weeks if you can, or if you're not in a rush, a month.
My spouse applied with only about a week buffer - it was a calculated risk, but we also had CBSA entry-exit records...