Demarc point. PPPoE proxy/relay or without IP allocation?

I’m wondering the best way to hand off our service at the customer end where we install a router onsite as a demarc point. Most of our installs are delivered at layer2 via wireless and we just hand them a cable to plug in to which they authenticate with PPPoE. I’d actually like to get rid of PPPoE eventually but for now it’s what we’re using. So my question is with MikroTik what is the best way to hand off the service to them?

The reason I want to install a demarc point there is so that we can effectively get end-to-end access to higher paying customers so we can test if they have so much as an ethernet issue, as sometimes we are fine to the CPE radio but there’s an issue somewhere in the cabling to their router. As well as run other tools that a MikroTik provides
Since I want to move away from PPPoE in the future, is it possible to either…

  1. Have the CPE router initiate the PPPoE connection on behalf of the customer but without assigning itself an IP address, and then have the CPE router act as a DHCP server to hand out their publicly assigned IP address to them?
  2. Have the router relay a PPPoE client through itself to a PPPoE server upstream, without bridging the 2 interfaces together

Option 1 is better as it means the customers router can be configured as ethernet/dhcp client and we won’t need them to reconfigure when we get rid of PPPoE