I have to say, I am a bit confused as to what you are currently using for amp/preamp. Your photos show an Arcam integrated, yet your text indicates NAD, though your components list includes the Arcam integrated.
The reason I bring this up is due to me adding an Arcam AV-9 preamp/processor, and DV 139 universal player. I have been very pleasantly surprised at how good these two units have turned out to be. I bought both of them used, to replace higher-priced components that quit working, so it makes me happy that the Arcam units have acquitted themselves so well.
Nice system, and a very nice room. Regards, and enjoy,
Dan