RE: Which charger?
I've spoken with Chargemaster who booked me in for a wall unit pretty sharply. I went for the Type 2 socketed unit, as from what you've said and what I've read elsewhere the Type 1 flylead isn't a long term solution.
The only question remaining is whether I want a 16A or 30A unit, and I'm undecided. It's a commuting car, and a second car, so I have no plans to use it much beyond mornings and evenings and in which case the 16A choice will be fine. The 16A is also free whereas the 30A is £95.