All-In-One (NAD C-658) vs NODE N130 with Separate DAC and Headphone Amp

Right now I have a NODE N130, upgraded with a linear power supply, and a SMSL M400 DAC. THE M400 doesn’t have a headphone plug, so I’m looking at a headphone amp, such as a Singxer SA-1. But, I’m wondering…how would all that sound compared to a NAD C658? Anyone make that switch?

The reason I’m asking, it that there is a convenience factor in having everything in 1 box. Right now I have to use my iPad to control the NODE, and a remote to control the volume on the DAC. Adding a headphone amp is another system.

I haven’t read rave reviews about the NAD, but it has DIRAC, which might help in my large room full of windows and hard surfaces.

I might add that I have 2 powered B&O speakers, and 2 powered subs.