I would definitely agree that the ethernet stage can be the most complex, and certainly seems to allow the most possible upgrades, warranted or not.
And I would certainly agree with @sns , that a decent switch can make things worse. I tried the Network Acoustics Muon between my Netgear Orbi router and my Zenith streamer and liked it a lot, until I experienced severe drop-outs (the NA guys suspected the router wasn’t very good at “auto-negotiating down to 100mb/s”). On their advice I added a bog-standard TP-Link switch with decent iFi power supply between the router and streamer. The drop-outs disappeard but it sounded awful - really brittle and bright.
I currently have an SotM ISOCAT7 and dCBL-CAT7u.