You should consider building a pair of PC's out of DH labs shielded power cords. Throw them into your mix and see. I suspect you'll find the shielding works really well in the pre and amp.
https://www.partsconnexion.com/DHLABS-75520.html
https://www.partsconnexion.com/DHLABS-75520.html