Advice on AP upgrade

Ive not been happy with my current ORBI mesh system.  I've had lots of issues when the power has dropped in the area, plus it doesn't support Vlan tagging.

So I thought I would  look for an upgrade to attach to my gold.  Now I live in Norway so choice is limited.  I would like WIFI 6 and Vlan tagging to separate iot devices etc wirelessly and not wired as standard and I really only need an AP and not a full router capability with WIFI.  I also would like the option of adding more AP in a mesh if the need arises.

Options  I've found:

Aruba AP22 instant on.  

Ubiquiti U6 LR AP.

Any thoughts would be appreciated, or something else I should consider.

Thanks

Andy