I auditioned the new D4 (803/804) powered by Classe Audio and I didn’t like either of them but it could be the amplifications and the speakers were merely broken-in (I used to own N802 and love it!)
IMHO you may want to consider upgrading the NAD amp which should give you much better sounding than going from N804 to 804D4