I bought a couple of something very similar to these, the electrician that installed them just used a really cruddy screw type connector like this and lots of insulation tape to connect into the lead coming out of the switch.

Is there a flat connector that can be unclipped if required that will neaten this job up? There's an 18mm gap between the wall and the back of the light fitting.

I'm thinking of something like this.