Vlan switching alt. Igmp-proxy for iptv?

[Fredge]

I'm trying to get my IPTV to go through my EdgeRouter Lite. My current setup is, I have a ToughSwitch PRO connected directly to the ISP-provided rj45 jack in my house and my STB's to the switch on Tagged in/untagged out vlan. i also have my router connected to same switch. this setup is working with one small hickup, the ISP have a IOS/Android remote app that does not work. (works if i use the ISP-provided junk of a gateway)

would like to have this setup

     ISP
      |
  EdgeRouter ->ToughSwitch ->Computers etc.
      |               |
   ToughSwitch      UniFi
      |               |
   STB's           Smartphones etc. with controll App

Any tips or suggestions?

Thanks Fredge