Just a quick update:
Decided to do it right (mostly, anyways) while I was into the cooling system, so just ordered a thermostat, water pump, and fan clutch from Onur. Go-part is shipping out a Koyo 1917 radiator, as well, so with a little luck, we'll be good to go later in the week.