I was actually about to rec that very fic as well!

You are quite right in your analysis of course, but this season was such a mess that I just... went with it without trying to have it make sense, because it can't. (But out_there does a great job of it!)