Neutrally sounding CDP with a good resolution?

...just decided to post it as a separate thread...

Recently I had not very fortunate experience with upgrade of NAD C541i to Marantz 8400: I discovered that I really miss NAD's neutrality. What NAD lacked was a resolution, it was too grainy on top-end. Marantz is warm, laid-back, more musical - but I need that NAD's neutrality back, with significantly better resolution then NAD had. And I don't want it to be not laid-back nor forward - I'd prefer somewhere in between. What CD player would you recommend?

System
~~~~~~
Source: Marantz 8400 (formerly NAD C541i)
Amp: Moon i-5 (fast and neutral or a little on a bright side)
Speaker cable: AZ Satori (love 'em)
Speakers: Revel M20 (fast and neutral or a little on a bright side)