Wow, yeah, I hadn't even really stepped back to look at that pattern, but they very much did write off everyone who was "damaged" and then gave Clint a happy ending! AHHHHH

And yes, that last moment with Frigga really does sum it up -- they couldn't even take Thor seriously for long enough to give him one scene where they were willing to respect him through the whole scene.