I would opt for putting the GS behind the router, being sure to use the WAN port out of the GS.
Then let the Router do the PPPoE and also good idea to set a static IP for the GS.
If nothing else is lurking, this might do away with all your problems.

I haven't found any ATA or ISP modem that does PPPoE too well.