I like the idea of a very simple de-installation, so would prefer to keep the main harness intact.

I checked out eBay and think I've found both ends that I need. I didn't think to look there first as I assumed it was a bit too specialised and would be easier to source through here. Another one up for eBay:-)

Thanks for the nudge.