if the switch is not managed can you think of replacing it?
How many ethernet ports does the switch have? (if there are few it is better to convert an old router on which to install openwrt and transform it into a managed switch)
the biggest problem is that non-managed switches have an anomalous behavior with mixed ethernet frames (tagged and not)
