I would say you got every mile out of that fan clutch, yeah.
It looks like a 96-98 ZJ though I think. It could be a YJ but wouldn't have that style power steering pump... maybe a TJ? Haven't worked on one of those in a few years.
Either way, same parts/very similar parts, looks like you found your cooling problem.