WiFi 6e APs w/ VLAN tagging?

Long story short, I need a pair of 6e AP's to act as a backhaul between two rooms. I know OpenWRT is a long ways from supporting 6e hardware but I don't want to give up SSID VLAN tagging so I need some 6e APs that support it on their stock firmware. I've seen Ubiquiti has their enterprise 6e AP's on the market but they seem to be sold out. Are there any other 6e APs that support SSID VLAN tagging yet?

Worse comes to worst I can tag the AP's upstream port on the switch to put all of that traffic on its own VLAN but doing it by SSID is way more flexible!

Bumping this, hopefully someone has a better idea?