> The standard legal advice is to structure the agreement such as it still stands (severability) even if specific parts of it are struck down because of how likely that is.

I don't know about Canada but in the US this is standard for any contract of any type. The vast majority of contracts I've signed have specific clauses to that effect as well.