Time Capsule and Alternatives

So I'm running out of space on the my time capsule. I've considered buying one of the new models of TC and a 6 TB HDD, swapping the drives and bam, updated. But I've also been thinking about just getting a NAS system set up. My only thing is that I'm incredibly OCD about my media collection. Everything is properly labeled, and I've changed every icon to be the movie poster or DVD cover. So with that said here's where I'm at, Right now, I stream all of my media between a Mac Mini in my living room, my Mac Book Pro, and my roommates use their laptops
Files range from avi, mkv, mp4, and everything in between)
I'm wondering if I get a NAS set up, will I have to use a system like Plex to watch my files (which I don't want to do, I prefer just to go through the finder) and will the fact that my current media is on a HDD formatted for AppleShare cause me a great deal of ass pain?