+1, @fastfreight
Instead of purchasing mass produced modem/switch that is not designed specifically for audio streaming…keep your Comcast/Infinity and add a high quality switch that specifically design for audio to filter noise. Consider adding Network Acoustics Muon Pro Filter between your comcast/infinity modem and your streamer. I am using a Telegartner Gold Switch with LPS and haven’t felt the need to upgrade in over 3 years.