I now use a Lumia 1020 that I updated to 8.1 on the 15th. The music app does suck, but I don't care much because a smartphone has always been my 4th, then 5th, 6th, and now 7th-favorite music player. The 1020 is primarily a phone/communicator, internet access tool, navigation aid, and a camera; and, it does these things beautifully, and all significantly better than with WP7.
HOWEVER, music is my passion, and Zune is still my primary music Collection tool/hub/nexus on a newer Windows 7 desktop; and, my Zune players still sync beautifully with it. I use windows explorer to drag-and-drop about 12GBs of owned music on the 1020, and I play it almost only when I plug it in conveniently in my cars. The rest of the storage is preserved for photo and video needs/tastes. I do keep a WP 7.5 Focus -one of the three original WP phones- as a backup and lending device, but I couldn't give up my 1020. In fact, I may never upgrade again.