You can do the VLAN tagging on the OpenWrt router or the vigor (independently of the PPPoE session and the rest), both works equally well, but I'd prefer doing that on the OpenWrt router (as well). Yes, depending on your router, the configuration syntax varies a bit (swconfig vs DSA vs dedicated interfaces), but it's not rocket science either.