That looks perfect. I'll have to try to source one similar over here in the UK.
I think I'll probably go with a variable speed fan controller too, to be a bit kinder on the alternator, and scrap my idea of using the stock wiring.

Thanks,
Ben.