I didn't say (2) was okay, but since the issue here is around a new lock that's misbehaving, I'm saying the simplest immediate solution in the absence of someone willing to do the full overhaul before Friday is to fix (1) with the lock that's actually misbehaving