When you say they're both "hot" - is that as in "sticking your hand on it and squeeling then withdrawing it rapidly"? Or have you checked their actual temperature?
Remember, the thermostat stays closed below 74 or 82degC - your hand is just going to say "OUCH!" to either of those, no finer detail.
Get a cheap IR thermometer - less than a tenner off the 'bay. Fantastically useful for trouble-shooting cooling systems. Point it at the bottom and the top hoses, see if you actually are losing some temp or not.
Swapping the metal direct-drive fan for a plastic/electric one won't "increase bhp" - but it will reduce the power that's being wasted in spinning the fan, so you'll have more left for forward motion. But an electric one's something else to go wrong. Remember, with an electric fan (like on almost everything more recent than a series), apart from what's pushed over the rad by forward motion, there's no forced airflow until it all gets properly hot.