need simple PPPoE/VLAN capable appliance for upgrade to SNAP fibre

I'm gonna upgrade to a fibre service at my home with SNAP. I'm looking forward to it, but they've informed me that the wireless/switch/firewall thingie I have isn't not suitable. It currently looks like this:

Copper <-> MODEM <-> WAP/Switch/Firewall/LAN/Blah

The device they recommend is another WAP/Switch/Firewall/LAN/Blah. I don't need another one of those. Oh, and it costs $350. I want to keep my setup the way it is and use another device that will provide connectivity to the ONT. Basically, I just want to switch out the item labeled "MODEM" above. I'm told that it must do PPPoE and VLAN tagging. Can anyone recommend a simple appliance that just does the WAN to LAN bridging? It needs to look like this:

Fibre <-> ONT <-> [device] <-> WAP/Switch/Firewall/LAN/Blah

Thanks!