I'd probably be using custom firmware with the PSP, but I heard it's a bit of a bitch to mess around and get all the stuff figured out.
The new iPods seem pretty cool, but I already have a 2 GB Nano. I don't know if I REALLY need a brand new 80 GB one. I could maybe wait a bit to buy a Touch...