Had the same problem, as well as the leccy bit being worn
I bought a new disco one lock and key, around 35 quid
Took the key portion off the D2 fob, and keep it on the ring, as long as its close to the exciter ring, its fine
A small straightforward wiring splice and all is fine, new lock came...