So it eventually worked, just took a while.
Another quick question here. I asked about this at the Apple Store but didn't really get a good answer. I'll listen to a song. I won't download the song by clicking the little download cloud button. Looking at my usage, every time I listen to a new song, it takes up more room on my phone. I thought it would just play off the cloud?