I went with the surround myself.
I had the captivate before this, and samsung kind of scared me away from their smart phones. They were good, don't get me wrong, but the only real thing they had going for them was the SAMOLED. The humming bird chip was cool, but no android software was programmed to run well with it.
putting that aside;
the surrounds build quality is what really did it for me. that, and the speaker/kick stand combo. For me, I never really used any apps from android, aside from the stock ones. I never cared too much for the android games, and random apps they had. I used my phone more for media if anything else. Thats why I switched to WP7 in the first place. So naturally, I went with the HTC surround for the speaker/kick stand combo. I was wayyy to comfortable at work sitting down watching my episodes of the office through netflix.
honestly, while the SAMOLED did look a little better, thats not what i miss about it. The battery life is what I missed. Honestly, the quality of the HTC surrounds LCD is really good, and I am satisfied. I havent noticed any battery differences...I havent had much time to test it with the phone.
You honestly cant go wrong with either phone, thanks to microsoft being strict on internal hardware. So if you are looking for a more durable phone with some weight (similar to the original moto droid if you ever owned one) the the surround is a great choice. If you are looking for something a little more sleek and stylish, the focus is probably the way to go.