Buy a Zune80 if you're up to the slicker design and if you're tempted by the form-factor. Upgrade if you're OK with the current thickness (and looks).
Having some spare money for a Zune80 would be a motivator to upgrade as well of course, replacing the hard-disk's sort-off a cheapman's solution.
