Joe -
I wonder if either of these different Schiit products - the sys: https://www.schiit.com/products/sys (used in reverse - so outputs to inputs and vice versa) or the other option is possibly the saga-2: https://www.schiit.com/products/saga-2. It has a remote as well to switch outputs. For the tone controls mentioned above - I have always wanted to get one of these from Schiit - the Loki - which just adds tone controls.
Just a shot in the dark. Either one of your amps though I bet are winners.