I also got tired of organizing papers and websites (various articles I print to pdf), I just throw it all into Mendeley Desktop now and apply my own tags and so some minor modifications on author/title. I go with the "last name - year - title" naming and this works well enough for me.

I have an order of magnitude fewer docs that you; I can't imagine hand organizing that many!