What media player can handle both music libraries (AAC, MP3) and videos (AVI, MKV,...)?
This only hits your second requirement but, if you ask me, it's the more important of the two by a long shot: VLC. It can play just about anything you throw at it. It has support for play lists (both building and saving them) but it does not do any organization of your media. It is strictly a player.