Hi @Greg_Johnson,
Yes, I do agree that this solution would be better than the current one. Do keep in mind though, you should remember to enable multicast on the router:
Networking Best Practices Guide
ASUS Routers
We recommend enabling “Enable Multicast Routing” option in settings.