Android :: Music And/or Video App

I have a Droid Eris on 2.1

For music:
I'm really just looking for a better interface app. i don't like the way browsing works on the stock app. i hate how it doesn't "remove" a song from the list when i'm going thru shuffle mode. i'll come across the same song multiple times.

And i've tried Cubed, and it's a little better. but one thing that both apps do, is they include video files.
even tho the video doesn't play, the audio still does, and it's really annoying to all of a sudden hear a video start playing.

For video:
I would rather not have the app play codecs or anything, if it could just play the standard file types already accepted. but i can browse through the videos easier than using Gallery or Photos, or even Astro, that would be great.