I don’t think you have a fan issue. The radiator is about as good as it gets. You either have a restrictive thermostat or you are turning the water pump way too slow.
The aftermarket has a hard on for under driving the water pump to “make” more HP but in the end, it’s a power loser.
Measure your pulley’s and see how fast the water pump is turning.
Arguably, the best thermostat out there is the Stewart Components stuff.