I removed the lock yesterday as the irish Importer told me he would have "my parts" in the next days

I bought my 09-plate Tenere second-hand a couple of months ago and it came with the Yamaha aluminium panniers. Just the other week one of the keys snapped off in the lock, and I've been unable to get a spare - none of the locksmiths nearby have the appropriately profiled blanks. This is worrying as I noticed that the remaining key is slightly bent. I've straightened it (because I'm stupid) so I don't suppose it's going to last very long...

I wonder if it's too late to get replacement locks? Off to find a Yamaha dealer this weekend to find out...

For those who didn't know already: it's not the lock itself that is 'rough' but the plastic hinges and other moving parts. I applied teflon based chain lubrication spray on various parts: it now slides open with two finger touch. Use the 'straw' and push it in to get to the internals.

http://www.mijnalbum.nl/GroteFoto-H44TY6XL.jpg

HJ

Replacement lock set ?
 

I've just bought a top box as supplement for the side cases. Now i want to use the same key for all 3 ...

Anyone know the part number for a set of 3 locks with identical keys or if its possible to order a single lock for a specific key number ?

Reassembly of the mechanism ?
 

Continuing along with the story, after having broken a key off last night whilst attending our Adventure Riders Congregation.
Once home today I removed the offending barrel & extracted the broken section of key, I'm having a drama setting the mechanism up again so the lid lock has spring load tension again. I need an exploded view/hint as I must somehow, be missing the correct method to reassemble it.
Any ideas please?