High Oil Temp

I have a 1973 235 that appears to me to have an oil temp issue. The engine came out of overhaul 23 hours ago and during cruise indicates on the gauge one needle width from the redline. It will stay there until you are in an extended climb at which time it will then start "bumping" up close to the redline. I have read where several operators airplanes operate around the same temp. It just seems high to me. The baffling wasn't in very good shape so I am replacing it and maybe this will make a difference. We put a new oil cooler on it due to failure of the old one. Any suggestions would be greatly appreciated as I am new to the plane. If the new baffles do not get me the desired result then the vernatherm would be my next target. Maybe after break in the temp will settle down. Thanks. Mike