I will share my experience in this venture.
About a year ago, my water pump started seeping and I had wanted to add a trans cooler eventually anyway. Much searching here on the forums and I gathered parts galore. New water pump (gates) t-stat, belt, hoses, ZJ fan clutch, flush cooling system...