I thought about exchanging my 32GB for a 64GB, but instead, I think I'm going to go the iTunes Match route. I'll save the songs I listen to most often to the phone for offline use and just stream any other song I might want to listen to as I go. A side benefit will be the upgrade in bitrate because I believe most of my collection is 128 kbit/s.
^this