I have had both 5 and 6 blade fans on stock water pumps. No problems. I have a shroud but have never gotten around to installing it.
I have a vague recollection that Ford installed a 6 blade fan on some 1960 TBirds when the air conditioning option was included.
I also seem to remember some discussion on Squarebirds involving a higher capacity waterpump.