Reply to iTunes / Traktor track management query

Okay,

So it looks like I need to do something about my file management here. I have around 6,000 tracks, and am purchasing somewhere between 20-50 tracks per week at the moment. So my collection is growing pretty quickly. Coupled with me ripping my vinyl collection (another 6,000 - 7,000 tracks there), and it is going to get pretty unmanageable pretty quickly.

So up until now, I have been VERY lax in my attitude towards this. Basically I download my files into folders, and name them by the month / year I download them. i.e. 06 June 14 would be a folder name. I then run the tunes through mp3tag and extend the tags, before running them through keyfinder to detect the key.

Then I send back them up onto my server, over my home network.

Now I do all this on my multi-purpose laptop.

Then, if I want to play the tracks, I have to transfer them over my network to my Music PC, and analyse them into Traktor.

So, I want a better system for doing this. Ideally I would like to do everything on my laptop, downloading, tagging, keying, analysing, creating playlists etc... Then simply update my libraries on both my Music and Server PC's, before deleting them on my laptop.

I don't play music on the server PC, although it is capable of doing so, but it is just for backing everything up.

But, I would like to run the same management on all systems if possible (all running windows 7).

So I was believeing iTunes MAY be the way to go (although I do really hate the program), as that seems to be what most people are using.

So, is there any reasonable way to achieve what I'm wanting? Any hints or tips would be much appreciated.

Cheers