Anyone delivering TV and data on same WAN port with Calix?

Our ISP is getting ready to offer TV service, switch GPON vendors, and the way we deliver service, all at the same time.

We currently have 1000+ customers using Zhone 2726 routers and we are switching to a Calix solution. We will be running fiber into a 803G and delivering service to a customer's own router, or a 844E. This has been working great during initial testing with data.

We have a data VLAN that goes to a local distribution router, and a TV VLAN that goes back to the central mini headend. The issue that we are running into is that we can not deliver the TV VLAN and data VLAN to the same WAN port on the 844E. When setting this up on the 844G, you can just provision the TV VLAN on a different physical interface. Most of the Calix documentation is for using a MVR setup with a unicast and multicast VLAN for TV service, but this will not work for us as unicast and multicast are being delivered from a single interface on the MHE.

My next step will be to work with double tagging actions to see if I can put my 2 service VLAN's into a single VLAN, send it to the 844E, and untag it on separate physical interfaces. Does anyone have any experience setting up multiple service types to the same WAN port? I am not super committed to the way we are wanting to deliver the VLANs, but we will definitely be using the 803G to 844E setup.