A little update.. the good news is that ive managed to super glue the sutter release back in position so it wont fall off, the bad(ish) news is that the on-off switch is now just an "on" switch.
I think I can live with this though.. Auto off set to 30sec, always carry a spare battery, and remove the battery when not it use is my plan.
Hopefully that will keep me going till the X100W/Y/Z appears!