I just realized/found out that (we must have the same Santa) I can upload pretty much all my music to the "cloud" which will then make it accessible on my new Kindle fire, since most of it was bought there anyway... yay!
But how is your problem working out?