Wifi downstream better.
The two switches you're running are weak link in your setup, optimizing your optical downstream from those noisy switches is somewhat futile. A single switch in your audio streaming setup preferable to running two, and that single switch could be upgraded via an audiophile switch, even one the less expensive ones would be an improvement. Router powered via LPS would also be an improvement.
Noise is loss of resolution in streaming audio, once its lost no amount of downstream upgrades will get it back. Start upgrades with first link in chain and work down.