I finally gave in and traded in my Note 7 for an S7 Edge. Before taking the phone in, I made sure that I had a complete backup to my Samsung account. When I got my new phone, I used Smart Switch, with a cable, to move over the small stuff, and I figured I'd simply resync my music with my PC...