Now I have extended the oil pickup to the lowest area of the sump.
Have correct belt tension, and I have had fabricated a long cooling pipe extension to get the water from the inlet side instead. this saves clutter on the exhaust side and neatens things up.
I have also bought a celica radiator for it.