If you haven't already done it you might consider the water pump relocation. Do a search on that if you are not familiar with it. Much improved cooling if you are using the stock radiator. It would be easier to do before installing the engine.