Sending it into Benchmade is an option. Earlier this year (in January right before the CBSA stuff was announced), I sent in my 940 and 535 to Benchmade for warranty work from BC Canada (replacing the omega springs in both). They were sent back to me when the new CBSA guidelines were in effect. The entire process took about 2 months all told iirc and they made it back to me with no problems. Benchmade tightens the pivot(s) down hard when sending knives into Canada as to pass CBSA inspection. More recently I sent in my 485 to have the omega springs on that replaced and I have no reservations about it getting back to me given my previous personal experience with Benchmade’s warranty work and how they send the knives back to pass customs.
It may suck to have to send a brand new knife in for warranty service (wait time plus the shipping costs), but it certainly is an option, at least for me. Just my $0.02.