Thanks fellas! Think I've decided to go for a std. 941 pump, genuine Ford filter and a wiring loom from 'Prometheus'. He said that he could do a standard loom for me with Ford connectors so I guess that will be bolt-on. I also found a pair of new banjo bolts for the filter at eBay