This is the good sounding solution. If you are not ready yet… keep it in mind for later.
Add a two new direct lines. Direct lines from the breaker box significantly increase sound quality. One for the amp and one for the other audio equipment. You want the electrician to use 10 gauge wire.
Direct lines remove your system from the regular household stuff… as most lines are connected in different areas.