I would start with the preamp. I have been a long time appreciator of NAD and have owned a couple.
I think a tubed preamp could have a big impact / improvement on your system. In an attempt to recommend something cost effective… probably Rouge. A tubed preamp for sure.. an older Audio Research, VAC, or Conrad Johnson all sound like they would be really complementary.