I settled on the Unifi Security Gateway and Long Range Access Point in the end. More than I originally wanted to spend but less than I could have.
Set-up was a bit fiddly as I needed to change the IP address of the Gateway but it would not allow that until it had done a firmware update. Got there in the end and from there on in was pretty simple. Ports forwarded again and speeds match what I am paying for even over wifi.😁
I exclusively use Unifi/Ubiquiti kit, well except for the modem mode Hub3, and you have made a good choice. Yes, it can be fiddly to set up, but once done it works very well.
Currently using Unifi Security Gateway 4 Pro, 16 port PoE switch, 2 x 8 port PoE switches,UniFi Cloud Key G2+ (Running Unifi Protect and Unifi Network), 2 x Unifi AC Pro AP, 2 x G3 cameras and 2 x G3 Flex cameras.
Tudor There are 10 types of people: those who understand binary and those who don't and F people out of 10 who do not understand hexadecimal c1a2a285948293859940d9a49385a2
Mine is bit simpler at this stage. USG 3 and AP with controller running on my Centos box and an unmanaged 16 port switch. Wondering about cameras at some point but currently have a camera on zoneminder on said box.