If you haven't tried Plex I'd suggest at least giving it a go, I made the switch from XBMC early this year and haven't looked back once. It absolutely left XBMC in the dust for me - the UI, Transcoding, Performance and the option to have it run as a server/client model are all fantastic and pretty much work flawlessly.
That's not a bad idea actually, I'll have a better look at it. Turns out my NAS supports running plex server, and my main samsung TV has a plex client app. I'm loading in all of my library and will give it a go. Cheers.