There was still a decent amount of Maxomi.
I'm glad you included the scene where he's getting into the limo at the jail. That was one of a few great moments from season 4 (yuck).
Yeah, I preferred Ethan/Naomi's friendship to their romance. In general, I wasn't too keen on Ethan until his friendship with Liam of all people.
It was like the writers didn't care about developing his character past Annie's love interest until the latter part of season 1 so I didn't care, I guess. But he definitely got better and I don't think it was Dustin's fault at all.