The fact it gets hot when not moving, but is okay when moving is a good indicator it could be not enough air flow at idle, if everything else is good. Or not enough surface area in the radiator (higher fin count equals more surface area to radiate heat).
An option to going to electric fans, is...