Jon v NK was hardly fan service. It was set up and teased for seasons.
GW v Jon definitely is and has no point really. I don't even see Jon fighting back. He'd probably just accept his fate out of guilt.
GW vs the harpies (same harpies that killed Barristan) and GW at Casterly Rock spring to mind.