iphone 4s or evo 4g

I had a 32gb 4 and currently have a 16gb 4S, definitely happy with the 16gb. I had about 25gb of music on my old phone (my total music library is about 60gb now) and the decrease in size actually inspired me to reorganize my entire library and now I have my favorite music on my phone for headphone or car listening and a well-organized library on my laptop to play through my Logitechs and/or Native Instruments soundcard to please my audiophile side