Tagged and untagged vlan traffic over wlan

Hi all!

I have little problem and I’m not sure how to solve it. My network is routed.

My current configuration is:

CPE:
ether and wlan are bridged. wlan is set to station-bridge mode.
AP:
wlan and EoIP is bridged. EoIP is going to my central location where I have central hotspot.

Now, I want to reconfigure my network. I want IP connectivity to all of my CPEs.
My idea is to go with vlan setup. My new setup would be:

CPE:
ether1 and vlan1 are bridged.
vlan2 I’ll use for management and will get IP from AP.
AP:
2 vlans for every CPE. One for Internet traffic and other for management.
one vlan would be bridged with EoIP tunnel and other would have IP and DHCP server.

My problem is with users which CPEs wouldn’t be on-line when I make transition (around 20% of users turn off their CPEs).
If I put wlan in bridge, untagged traffic, nothing is working any more.
Is there a way to solve this issue?

Does anyone have any idea? Thx