Barrels and keys to fit the OE accessory panniers and top case are available but can only be bought from a Yamaha dealer. Many moons ago, when I had a Yamaha top case (and panniers), I replaced a lock barrel for exactly the same reasons as you... The keys are made of cheese!