Tempted to buy a video player

Right now I’m considering purchasing either an iPod or a Zune. The iPod does, baseline, what I want, but I don’t like the idea of iTunes or in general Apple mitigating my device. I don’t like how picky it is about video format, not just the use of H.264(which encoding to seems more difficult than other formats), but that it has to be the exact resolution and bitrate or otherwise it won’t work; great for iTunes-purchased content but that’s about it. Also, it’s the same price as the Zune with the Zune having bells and whistles.

I have a number of problems with the Zune, though. The 3×3 feature of the Wi-Fi, in combination to the Wi-Fi not allowing video transfer and not doing anything other than Zune-to-Zune communication means it’s not a very useful feature. The use of the WMV video format, though not quite as good of quality, is more friendly to the kind of conversion I would need to do. Also, the DRM it puts on music kind of conflicts with what I may want to do, and unrightly applies it to items under the Creative Commons. With the Zune, the changes that would make me happy seem to be for a future release, but I don’t want to wait until the end of 2007 to get a player.

Very conflicted. Any ideas, such as alternatives to these that will do what I want, would be nice.