Like what you have done. Amp choice can transition to different speakers if the Klipsch don't pan out.
Record cleaner?
Better Dac?
I am tightroping the digital with the analog and afraid selling short in both directions. Though budget constraints are a factor. Joe