In the end I made something of an effort in Hong Kong to repair the camera, not much success in finding somewhere able to do it in less than 7 days (Suspect the shops were all going to use someone else to do the work and then charge me...). Anyway, just have to get it repaired in the UK - I didn't want to spend my holiday worrying about this so didn't put a huge amount of effort into it. Did find one guy who would do it in one day near the Golden Computer Centre, but, he was on holiday the next day and I was flying out before he'd open.

Thanks for the help anyway, the replacement worked just fine