Regarding your second paragraph talking about Spotify adding random songs... It's a feature I absolutely hate, but I believe what you might be referring to are "smart suggestions" and/or the "smart shuffle" features. They annoy the hell out of me but can be disabled.

For smart suggestions, I haven't seen them in a while, but there was a toggle for it.

For smart shuffle, just hit the shuffle button again to turn it off.