I skipped after 3 of those episodes. Landed on the final one directly. Benefits of streaming.
I cannot begin to imagine the torture of waiting an entire week to watch your favourite show on TV, only to find out it's the same fucking episode, but animated and voiced a bit differently. 😑
I've already specified how I feel about Haruhi as a character, but your point about Yuki is so true.