Paul, it won't save you much (unless you need other connectors) but FFI sells the connector too (~20 beans). LRS might also sell it.
Thanks for the fan info. I've seen people post that the 6 and 8 cylinder fan motor were the same; I was pretty sure that was incorrect but never heard it from Ford. Many of the parts store fan motors are indeed single speed 6 cylinder versions.
Good luck bud.