Personally, I would stick with the separate components, instead of going with the all-in-one NAD.
It will allow you to improve your system, one piece at a time, especially if you want a better dac than is provided in an integrated amp.
As far as Dirac goes, I would suggest that room treatment is always the better option. instead of monkeying with the sound.