At&T: HTC Surround vs. Samsung Focus?

I'm a huge music person and I've been wanting a new phone. Currently, i'm looking at the HTC Surround for its 16GB onboard memory, but I've been hearing bad things about its battery life and freezing issues, while i've been hearing good things about the Samsung Focus. I'm just wondering from a Media standpoint which phone is better suited to my needs. I also use a MacBook Pro for everything, so i'm also concerned about syncing issues with Zune. Please help

Movies 24h | Dmart.vn