I'm going for a 7th time this coming weekend, because it's been a few weeks and I want to see it one last time before it goes from theaters.
The ending fight really gets to me. It's incredibly intense and the style is brutal, particularly in comparison to the PT. Like you I've come to really appreciate the non-verbal story telling in the choreography, and how the fight completes Rey and Finn's arcs in the film, while being a perfect reflection of Ren's personality and emotional state. Speaking of the PT, the fight also does not overstay its welcome - the Ren/Finn fight barely pushes a minute, because that's how long it takes them to tell the story they had to tell with it. There's no bloat, no flash for the sake of it. And that that lightsaber grab from Rey remains my favorite moment in the entire series. Dear lord that gets me every time.
As time has moved on I'm thinking TFA is near Empire on my episode rankings. They each do different things better than the other, but at this point I'm hard pressed to say it's not as good, overall, in its own way.