Another observation regarding the endless spinner problem, It takes time.
After a boot I can switch back and forth and there is no problem but if I wait a couple of minutes (10 or more) and then switch, I get the spinner.
And that's also why I was not able to reproduce the problem.
So my actual workaround is a reboot, then I can switch between local and streamed channels.