One vote for mini pc router with poe wifi ap. When I first set it up I had a tp omada wifi 5 and switched to a yuncore/kuwfi wifi 6 ap flashed with openwrt and I didn't even have to touch the router config, although I did so the new ap would get the same ip as the old one.

As a path to ease in I was also considering keeping whichever of my older tomato and openwrt routers was more powerful processor wise with the wifi off and using the standalone APs as an upgrade to wifi5/6, but the used pc with 2.5gbe and 10gbit sfp+ came into my possession cheaply so I went for it.

PC router has opnsense though. I haven't tested x86 openwrt. I also got it cheap because the sfp nic didn't work, warning of checksum error but I fixed that using intel eeupdate (have to pirate/have nda breaker friend) on a portable windows 10 install.