You're problem was you didn't do "Transfer purchases" before you upgraded. I upgraded my phone with no problems, you always lose your music, it's a given. It allows for the upgrade to go faster, Apple figures you will have that music on your computer anyways.