PPPoE on Routed Network Best Practices

I am starting this thread because I have been doing something wrong. I know it, but until today everything worked fine, and I do not know the best fix.

Currently I have (BAD)

Client device with PPPoE client (MT or Other) > Eth1-X on Mikrotik building router >> Bridge to EoIP id X tunnel >> Routed Network >> EOiP id X to a bridge called PPPoE Bridge >> PPPoE service running on this bridge.

I know this is bad because when I do an /ip neighbors print, I see all the other building routers… too much broadcasting, but it has worked up till now.

The real problems started when I started bridging VLANs onto the EoIP tunnels. The first one went fine, but as soon as I set up the second one, my vlans started conflicting on my cisco switches, VLANS from one building were conflicting with VLANS from another.

My temporary solution was to put a PPPoE server on the two EoIP tunnels that had VLANS bridged on them. This worked but does not seem to be a good option.

So…
What is the best practice for concentrating PPPoE on a routed network?