Choices for Community Fibre?

In my other place I have a Pi4b running 21.02.05 that's with Time where we get userid/pass etc. That's fully cabled so I can have the 4b near to the fibre modem and the APs easily elsewhere. I am for now back in the UK and it is community fibre, their router offering is a Linksys SPNMX56 which is a bit rubbish TBH. I could I suppose swap it for a 4b, I do have one that is currently setup to run pihole/pivpn here but I'd still need an AP. I was wondering about grabbing either of MERCUSYS MR90X or NETGEAR WAX206 both of which are selling around £85 on Amazon any thoughts on which is the best of those two, as far as I can see the community fibre uses autoconfiguration for the setup hopefully this works before I buy a box. It is a fairly average 3 bed semi so no Ethernet cabling albeit WiFi coverage seems okay from the SPNMX56 in the rooms we mostly use. Or can I use the Zyxel WSM20 which is an AP but is it also a router?

While my remote device is currently 21.02.5 I guess I'll go with whatever is the latest. I'd like to implement something similar to the firewall update I have on the remote 4b see this post Firewall update script - #5 by pavelgl now iptables is not used is that still possible?