Pandora is said to be working on a competing service to launch next year. They bought what was left of rdio, so I'm expecting the client won't be as generally bad as Spotify's.
Pandora's radio is already superior to Spotify's. I'd jump all over that if it happened.
I'm planning to do the same, I have a hard time imagining that it could be worse.