Fan on Motor, Speedo or Both?

I've got some results from racing yesterday...

I made two changes to the truck, first this was my first run with the RC-Monster Heatsink/clamp. I also moved the fan to the speedo. I moved the fan for two reasons, the last time I ran, the motor was cool at about 170 degrees. I had a Trinity heatsink on it with the fan blowing air up from the bottom. I didn't have a fan on my speedo which was hitting 140-145 degrees. Too hot for comfort. So I moved it. I had the fan RIGHT on top of the speedo and as posts in this thread suggested, I had the air flowing right DOWN onto the speedo.

Good news - the speedo was temping about 120-125 degrees after installing the fan...much more comfortable and safe.

Bad news - the 10L motor was way hot at 200-210 degrees. I need a second fan for the motor...rats. I'm just not sure I don't have some other problem like my gearing (10L, 14 cells, Gorilla 1 speed conversion {so I'm in 2nd}, 64 tooth spur, 16 tooth pinion.) I hit full throttle at about 3 or 4 places on the track just for a second or two. I can't imagine gearing it taller but I've read elsewhere the reason for the high temps is the high RPM at full throttle. Other possibility is the settings on my 1897 speedo...I've set the DIP switches as per what I "think" is right but no one has ever been able to tell me the right settings with confidence.

Hope the fan cools things down...