No need for Fibaro’s hub, ST will talk directly to the modules.
As for light switches, replace them with momentary switches rather than rocker switches. It makes much more sense. You have a variety of styles and manufacturers to choose from. I went for a Schneider Electric screwless chrome switch. This can come in doubles, quadruples, whatever you want really.
A point of note here, is that if you have momentary switches you can use one module to control both the light wired to the socket, and have a second ‘smart’ switch. I have a second switch in my lounge which turns on a smart bulb in a lamp in the corner. No additional wiring needed.
I also have a second switch in the hall which puts the house in night mode with a double click.
As for plug sockets, LWRF is pretty much the only in-socket solution for the UK. Other relays are available, but nothing built into the socket. I’ve heard good and bad things about them, but if you have them already you may as well keep them. You can still control them via IFTTT using ST.