Agree that the middle of the season was pretty dumb. It felt like a lot of filler.
I believe I said earlier in the thread that Ollie needed to have his, "I'm Iron Man" moment. This should not be retconned. They have gone to that well far too often. Hopefully, the new showrunners take that baton and keep going in the direction of him being outed.