Managing when song versions change in a playlist

[bentwookie]

Fairly often, a song that I've had in a playlist for ages is replaced with a crummy dance mix, or karaoke version. I get that the licensing has probably changed, but often I can find the same song still in the catalog. When this happens, it becomes difficult to fix the situation and replace the newly-inserted low-rent version with the original. I have to drag the correct version to the playlist, and then drag it to the correct spot in my playlist (which given whatever cross-platform garbage the app is implemented with, doesn't work like it should).

Is there a way to:

1) Prevent Spotify from changing out my songs. I'd rather it not play than play some junk

2) A replace song with... picker to better manage this situation?