So what I see is 5A sockets being placed beside some of the 13A…. All from a 20A RCBO.
I presume there’s no neutral at the existing switch, hence the need for the 5A FCU… so two circuits in the switch? (Make sure it’s noted, even a warning sticker inside the back box??)
You’ll need to also be aware of safe zones for cable runs.
Being DIY, have you worked with electrics before?