Quick update - after a visit to a couple of dealers and a few emails I took a drive through to Macklin Motors in Glasgow today. Service was night and day compared to the other dealers and I walked away with a car on order!
Managed to get a 30Kw Tekna in gun metallic at 8k miles a year for £252 a month for 3 years. Still a bit higher than some of the other offers I'd heard of but I think the interest in EV's is increasing and so the deals are going too.
Also got the 30Kw version at a slightly cheaper price than the 24Kw was because of the trade-in value being higher at the end and the protection pack was thrown in with the cost offset to help them hit their targets.
All in I'm very happy. No idea of the delivery times yet but fingers crossed it won't be long!