What fan to use

Yes, you want a good clutch fan. Finding a good, stock unit and putting a new clutch on it wouldn't be a bad way to go.