Another thing I totally forgot that really helped in my noise situation is rca caps to short the unused inputs. I realize it sounds like a stupid little tweak, but it really did help. Plus an Amazon deal you can return the next day if it doesn't help, so no risk at all.
Amazon link here
