It worked! Had to switch the blue and yellow wires around at the switch as they were reversed and changing them at the light made no difference but it's working perfectly now. I sleeved all the earths and used a wago with an extension to the socket aswell. Getting all the wires back into the ceiling was a real tight jam, as was getting the cables into the fittings terminal as it sits so flush to the ceiling and had very little play, length wise. When I've a little time I'll see if I can tidy it up a little in there, but for now the lights are working and that's the most important. Thanks to everyone for all your help and replies, really appreciate it ???