My suggestion would be to first see where you end up with the Schiit Loki in the signal chain. If it solves the tonal balance issue with your current amp, then it will also solve that issue with an SET or OTL amp (unless the knobs are already max’d out). And from there, you can probably guess which 30-watt amp I’d suggest.
Duke