It's really hard to fit a fanclutch in front of a 2F in a Pig. Toyota only did it in '78 when they put a 2-row radiator in the 55.
Pigs with 2Fs just do not run hot unless something is really wrong. If the waterpump is not leaking out the weephole, it's probably ok. Run your pig without the thermostat, see if that helps. I might pull the radiator and either give it a muriatic acid soak or have it rodded at the radiator shop. Check the big radiator hoses too, I have heard of them disintegrating on the inside and blocking flow.
But if you're blowing off the top of the overflow bottle, I'd do a compression test to rule out the head gasket...