I realize it's too late now, but I'd have tried a stock fixed fan long before tossing an aftermarket flex fan on it. Didn't you say it's overheating when moving anyway? If that's the case, airflow may not be the (only) issue.
Maybe there was some junk in the water jackets in the block that were jarred loose and clogged some of the tubes in the radiator?
