Today I'd move to a Google Mesh network solution.

Yes, the RT-AC88U did made the cut at https://www.cnet.com/topics/networking/best-networking-devices/ today but you asked for best so at 4000 feet I'd move to the mesh.

As to WAPs I know the RT-N66U and just fixed one last month by updating the firmware. (Nothing was wrong with it, it just had the firmware it came with years ago.) Google "How to use a router as a WAP" because I don't buy may WAPs because we don't need them.