The Ellis discussion at the end did come as a surprise, as I thought that was a character they had done away with. I didn't see that coming until Eileen was talking w/ Tom, Julia and Derek -- and even then I kept thinking to myself that, no, I believe they announced they were releasing the actor & ending that part of the storyline.
The show has been harder to get into this season, but honestly I think it's because they are addressing what I saw early on was going to be a problem -- sustainability of the storyline. They're only going to be able to milk the Bombshell idea for so long. I kept wondering, what the heck are they going to do to keep the show going? In order to continue to deliver story with new songs without swapping out cast entirely so we can watch another show come to life, etc, they've branched out in new ways to keep the Bombshell folks central in the mix, but propel them logically in different orbits in order to be able to have new songs, etc.
In a lot of ways that is making this season far less satisfying, but I'm gonna give them some time to do some character and story development with the new people. I hope the show doesn't burn out, there's so little to enjoy anymore.