What IP rating is the 240v light above the shower?
you say you'll be removing the switch that serves these lights by replacing with choc blocs / terminal blocks - is it possible to change this to a FCU fitted with a 3amp fuse so the lights are served from this?
The burning/smoke I suspect...