I'll second the Vision: M. A PSP simply cannot hold enough music / video for what you'll probably be looking for. Although with the money you've got, you could probably get both
.
The only thing better imo than the Vision: M is the 80GB next-gen iPod, which I don't believe is out yet. Although... iPods and iTunes are still really sucky...
(although creatives software isn't much better)