The Netgear and MokeLink works fine at the moment but long term is it time to upgrade?
TP-Link Omada is a good option:
Nice desktop AP with additional LAN ports and DC power supply:
EAP650-Desktop is an AX3000 Desktop Wi-Fi 6 AP. One fiber to carry wired, wireless, voice, VoIP, data, and HD video services. Supporting PPSK, it's ideal for for retailers, offices, and hotels.
www.omadanetworks.com
I would add this Gateway for up to Gigabit ISP:
ER7206 supports Gigabit Ethernet connections on both WAN and LAN ports and multiple VPN protocols and high-security, high-performance VPN capabilities, making employees’ remote connections to their main offices as secure as if they were in the main office.
www.omadanetworks.com
Or this one for >Gigabit ISP with two links to every Netgear switch for >Gigabit aggregate throughput:
ER707-M2 supports two 2.5G ports, as well as multiple VPN protocols and high-security, high-performance VPN capabilities, making sure that employees' remote connections to their main offices are just as safe as if they were there in person.
www.omadanetworks.com
I would also prefer the hardware Omada controller for simplicity and reliability:
With the on-premises Omada Hardware Controller, Omada offers flexible on-premises and free cloud access to centrally manage of the whole network, including access points, switches, and gateways. No need to keep a PC/server running
www.omadanetworks.com
Ubiquiti UniFi has better features Gateways:
This one is a Gateway, Controller and Switch 3-in-1 up to 2.3Gbps WAN/LAN:
Compact 2.5G Cloud Gateway with 30+ UniFi device / 300+ client support, 2.3 Gbps IPS routing, and selectable NVR storage.
store.ui.com
I personally use this type of desktop/wall/outdoor AP on my networks, comes with PoE injector:
Sleek, indoor/outdoor WiFi 6 AP with 6 spatial streams designed for mesh applications.
store.ui.com
Wi-Fi 7 AP options are available from both Omada and UniFi, but with Gigabit uplinks they don't make much sense. Upgrading to Wi-Fi 7 will require entire system upgrade including the switches.
Upgrading everything to Omada or Unifi will be very nice for a single pane of glass management, but will be also the most expensive option. OPNsense/pfSense appliance will work as Gateway as well, but will introduce extra configuration complication on perhaps even higher cost.
I would integrate the Gateway and the APs in one system and configure manually the existing switches. The Netgear switches can do VLANs, the MokerLink PoE is good enough for the cameras.
Good luck!