Luxman L-595 preamp section will utterly outperform the Yamaha’s preamp on all fronts. Have you tried this? The Moon 861 is a reference level amplifier that ought to be paired with a preamp in a similar class to show you what it is really capable of. Get the Pass Xp-22 ; it’s a full sounding pre with beautiful tonality and should really flesh out your 861- your Yamaha tone on steroids. The more gear you have laying around can cause inability to relax with what you have- always changing for the sake of different sound placing the emphasis on the gear and not the music. I’ve been there and know this equipment contagion syndrome well:) sell it all ; keep the moon, get pass preamp then reassess in a few months.

