iTunes 11 organization question (HELP!)

I recently upgraded to iTunes 11 and I feel like I made a big mistake. It feels like all of the work I have put into organizing my music in previous versions has been undone.

However, I am trying to keep an open mind and see if I can learn what I need to do to get back to where I was with my music organization.

First, I will say that I probably have a lot of unconventional music and use it in an unconventional manner. A huge chunk of my music is used for tabletop RPG gaming, where I play music that is appropriate to whatever is happening in the game. For example, one of my Genres is "Combat" and another is "Background". Both Genres have "Artists" called "Video Games", which contain music taken from various video games I have owned (further sorted by "Album" further down the heirarchy). A LOT of this music was either never part of a conventional album or has since been renamed by myself to better suit what I am using it for.

Rather than getting into what iTunes has done to how my music is displayed on my iPhone, let me explain what I want out of iTunes and see if someone can help me use iTunes 11 to get there.

I want to set up iTunes 11 so that on my iPhone I can go to "Music", select "Genres", select a genre, and have it display Artists IN THAT GENRE *ONLY* in alphabetical order. Then I want to be able to select one of the Artists and have my iPhone display ONLY the Albums BY THAT ARTIST, IN THAT GENRE, in alphabetical order. I do NOT want to see Albums by that Artist that are in another Genre, for example.

I want to see the Album titles ONLY, *NOT* each Album displayed as some kind of header followed by every song that Album contains. I want to have to click on an Album in order to see all of the music it contains.

Finally, I want my iPhone to stop playing music once the last song from an Album has been played, NOT skip ahead to the next Album and start playing music from it.

Right now, if I go to "Music" on my iPhone, and choose to view Genres, it displays them all well enough and in alphabetical order. Once I select a Genre, however, things go wonky. Say I select "Background" -- it will display a list of Artists in seemingly random order, many of which are repeated one or more times. Many of these Artists (such as "Video Games") have a different Genre than the one I selected, but do have the same name as an Artist in the Genre I DID select.

iTunes 11 SEEMS to be trying to display EVERY instance of EVERY Artist saved in the iTunes library, even if it that instance isn't part of the Genre I selected. This is not what I want.

Any advice?