At 3500 your Cruise timing should be at least 50>56 degrees.
...The reason for that, principally is that the huge 7-blade fan runs on an HD thermostatic clutch, which cycles between almost full slip and full drive, in accordance to what the temp is, of the air that is coming thru the rad.
The waterpump on mine is UNDER-driven in an effort to keep the belt on at 7200 rpm. And yes, she runs an 8-vane pump with an anti-cavitation plate.
But I gotta tell you the whole truth, the first year that she was on the road, I had a heckuva time keeping her cool. Even the second year. And like you, I tried everything.
Finally I took the engine down and honed the holes out another half a thou, and increased the top-ring gaps by IDK, maybe .003>.005. Badaboom, problem solved.
So, IMO, when all else fails, you gotta think about the ring-gaps. If/when you get a lotta heat in the chambers, sooner or later, that heat is gonna find it's way into the pistons and rings. When the rings swell and the ends butt, Bam! you got instant mega-friction, which makes heat.