Yeah as much as I hate that he didn’t die/was “magically revived” in the rushed montage at the start of the series finale, I agree that what you’re left with (the fact that life goes on and you just sorta have to live it) does hit a lot better than just having him die.
I think about the water scene all the time. It’s more important for people like that to be “right” because it validates their sense of self-worth, but at the cost of common sense and listening to the people around you.
Having said that, I don’t hate Diane at all, and I loved the trajectory she’s on when we leave her at the end of the series. Who wouldn’t wanna marry sweet buffalo-man LaKeith Stanfield dayum 😍