Cooling System overhaul recommendation help

I should have refreshed the system long ago but I have decided its finally time. Ive been trying to decide between the Nissen Z3M radiator with a puller E-fan, but many people recommend the E36 M3 Mishimoto radiator, from what I know, both are plug and play except the E36 radiator gives a little more clearance. Although Mishimoto has also been going down in brand reputation with leaking problems. How close is the clearance on the Nissen radiator if anyone is running it? The E-fan I'm looking at is a 16" puller, depth is 3.740 inches, would this rub on anything if anyone has any info? Also I was thinking of getting all new Rein coolant hoses and a new water pump, as well (My current fan is warped and I believe the harmonics messed up my water pump even though it got changed last year). But radiator and fan are the last deciding factors. If anyone has any insight I would greatly appreciate it.