I like the fan and water pump to be at least slightly overdriven. The crank pulley should be larger diameter than the fan pulley.

Another thing to look at is the fans. Dual 10" fans I believe. Often this does not flow enough air at a stop to keep cool. When running down the road the fans and their shroud act as air restriction and not enough air.

Can you put the stock fan/shroud on at least as a test?