Alternative to iTunes for managing videos?

I'm getting tired of fighting with Apple's iTunes to get it to play my non-iTunes media. I've tried the 32-bit trick, and MOV files I remove from the library and add back no longer show up in the Movies or TV Shows categories, so that trick fails, as well.

Every time there's an update, Apple breaks support for AVI, MP4 and — most recently — MOV files not purchased from Apple's iTunes store. So what alternatives to iTunes exist that manage to support a mix of media that Apple now seems to go out of its way to break?

There's Usher, by ManyTricks, for $35. I haven't used it myself, but it looks great and follows iTunes/iPhoto's design principles. I trust ManyTricks to make a good app: they're behind my favorite window manager, Moom.