How can I "FIX" WMC7, to work as well as XP MCE?

I detest the way the new media center catalogs and displays my video collection. I have 6TB of hard drives with well sorted nested folders, so that I can browse through categories as I have defined them, and see the movies / TV shows I want when I want.

Now that I have 'upgraded' to Win7, while I like most of what they have changed/updated from XP MCE, I have lost this, with all of my movies dumped into this huge unmanageable collection with no sorting whatsoever! And scrolling through the list is ridiculously painfully slow!!!

Is there a way I can get this to work as the old version did, and recognize my nested folder structure?

If not, is there a way I can run the older media center on Win7?

Failing that too, what other software should I use to fix this outrageously stupid 'upgrade'? (Feel free to recommend Linux titles as well; if they have so screwed up the MC that I have to get third party, I am just pissed enough to permanently switch to linux!)