I'm now on a quest for a high-end music server but the pickings are pretty slim until recently: ZeroOne Audio! (http://www.zerooneaudio.com) I'll probably pull the trigger and grab one toward the end of this year.
I made that statement back in 2005 and finally was able to follow through. I picked the Naim ND5 XS for its performance, reliability and ease of use (via n-Stream iPad/iPhone app).
TV is now updated to Sony 65" XBR-65X950B ultra HD flat-screen.
I simplified my system by taking out the Cinema/Meridian/Primare combination. HT duty is now handled by the Yamaha YSP-3300 soundbar + subwoofer. The Logans is now a dedicated 2-channel audio only system.
I added a Synology DS415+ NAS to have my movies and music in a centralized location.
Here's my system before (top) and after the update (bottom)